diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-09-28 08:40:36 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-09-28 08:40:36 -0700 |
| commit | 894b3c35d1de9cfa4f72b21e280d80d278879c20 (patch) | |
| tree | d0ac16e7248ddedd1767780046dd1aba12dc266b /fs/ceph/dir.c | |
| parent | 9717d5343849beb4ccf96df7bbf347660fd8898d (diff) | |
| parent | c08dfb1b49492c09cf13838c71897493ea3b424e (diff) | |
| download | linux-894b3c35d1de9cfa4f72b21e280d80d278879c20.tar.gz linux-894b3c35d1de9cfa4f72b21e280d80d278879c20.tar.bz2 linux-894b3c35d1de9cfa4f72b21e280d80d278879c20.zip | |
Merge tag 'ceph-for-6.12-rc1' of https://github.com/ceph/ceph-client
Pull ceph updates from Ilya Dryomov:
"Three CephFS fixes from Xiubo and Luis and a bunch of assorted
cleanups"
* tag 'ceph-for-6.12-rc1' of https://github.com/ceph/ceph-client:
ceph: remove the incorrect Fw reference check when dirtying pages
ceph: Remove empty definition in header file
ceph: Fix typo in the comment
ceph: fix a memory leak on cap_auths in MDS client
ceph: flush all caps releases when syncing the whole filesystem
ceph: rename ceph_flush_cap_releases() to ceph_flush_session_cap_releases()
libceph: use min() to simplify code in ceph_dns_resolve_name()
ceph: Convert to use jiffies macro
ceph: Remove unused declarations
Diffstat (limited to 'fs/ceph/dir.c')
| -rw-r--r-- | fs/ceph/dir.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c index ddec8c9244ee..952109292d69 100644 --- a/fs/ceph/dir.c +++ b/fs/ceph/dir.c @@ -2058,7 +2058,7 @@ static int ceph_d_delete(const struct dentry *dentry) return 0; if (ceph_snap(d_inode(dentry)) != CEPH_NOSNAP) return 0; - /* vaild lease? */ + /* valid lease? */ di = ceph_dentry(dentry); if (di) { if (__dentry_lease_is_valid(di)) |