diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-03-02 10:05:10 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-03-02 10:05:10 -0800 |
commit | 2833419a629d2d0eeb46f97c529f1057db7537b2 (patch) | |
tree | f628cf34dc2ba1edd8a6194a0e3ebfdfed1f7e08 /fs/ceph/super.h | |
parent | Merge tag 'for-linus-20180302' of git://git.kernel.dk/linux-block (diff) | |
parent | ceph: fix potential memory leak in init_caches() (diff) | |
download | linux-dev-2833419a629d2d0eeb46f97c529f1057db7537b2.tar.xz linux-dev-2833419a629d2d0eeb46f97c529f1057db7537b2.zip |
Merge tag 'ceph-for-4.16-rc4' of git://github.com/ceph/ceph-client
Pull ceph fixes from Ilya Dryomov:
"A cap handling fix from Zhi that ensures that metadata writeback isn't
delayed and three error path memory leak fixups from Chengguang"
* tag 'ceph-for-4.16-rc4' of git://github.com/ceph/ceph-client:
ceph: fix potential memory leak in init_caches()
ceph: fix dentry leak when failing to init debugfs
libceph, ceph: avoid memory leak when specifying same option several times
ceph: flush dirty caps of unlinked inode ASAP
Diffstat (limited to 'fs/ceph/super.h')
-rw-r--r-- | fs/ceph/super.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ceph/super.h b/fs/ceph/super.h index 21b2e5b004eb..1c2086e0fec2 100644 --- a/fs/ceph/super.h +++ b/fs/ceph/super.h @@ -987,7 +987,7 @@ extern void ceph_check_caps(struct ceph_inode_info *ci, int flags, struct ceph_mds_session *session); extern void ceph_check_delayed_caps(struct ceph_mds_client *mdsc); extern void ceph_flush_dirty_caps(struct ceph_mds_client *mdsc); - +extern int ceph_drop_caps_for_unlink(struct inode *inode); extern int ceph_encode_inode_release(void **p, struct inode *inode, int mds, int drop, int unless, int force); extern int ceph_encode_dentry_release(void **p, struct dentry *dn, |