diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-14 18:45:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-14 18:45:31 -0700 |
| commit | 96e35b40c0d6206f56370f937f6f4722739eb273 (patch) | |
| tree | 2c387b6e3f628484a1f4bdc964e529f89d5f5821 /fs/ceph/super.h | |
| parent | f5c07a2d8acfc98e00d3be6298f979e5b3175953 (diff) | |
| parent | a6a5349d17f2a5c37079826f1a1474c3d08c6b53 (diff) | |
| download | op-kernel-dev-96e35b40c0d6206f56370f937f6f4722739eb273.zip op-kernel-dev-96e35b40c0d6206f56370f937f6f4722739eb273.tar.gz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
ceph: use separate class for ceph sockets' sk_lock
ceph: reserve one more caps space when doing readdir
ceph: queue_cap_snap should always queue dirty context
ceph: fix dentry reference leak in dcache readdir
ceph: decode v5 of osdmap (pool names) [protocol change]
ceph: fix ack counter reset on connection reset
ceph: fix leaked inode ref due to snap metadata writeback race
ceph: fix snap context reference leaks
ceph: allow writeback of snapped pages older than 'oldest' snapc
ceph: fix dentry rehashing on virtual .snap dir
Diffstat (limited to 'fs/ceph/super.h')
| -rw-r--r-- | fs/ceph/super.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/ceph/super.h b/fs/ceph/super.h index ca702c6..e30dfbb 100644 --- a/fs/ceph/super.h +++ b/fs/ceph/super.h @@ -715,8 +715,7 @@ extern int ceph_update_snap_trace(struct ceph_mds_client *m, extern void ceph_handle_snap(struct ceph_mds_client *mdsc, struct ceph_mds_session *session, struct ceph_msg *msg); -extern void ceph_queue_cap_snap(struct ceph_inode_info *ci, - struct ceph_snap_context *snapc); +extern void ceph_queue_cap_snap(struct ceph_inode_info *ci); extern int __ceph_finish_cap_snap(struct ceph_inode_info *ci, struct ceph_cap_snap *capsnap); extern void ceph_cleanup_empty_realms(struct ceph_mds_client *mdsc); |
