diff options
author | Yehuda Sadeh <yehuda@hq.newdream.net> | 2010-06-11 19:58:48 -0400 |
---|---|---|
committer | Sage Weil <sage@newdream.net> | 2010-08-01 23:11:40 -0400 |
commit | cd84db6e4051a9fb7941d49d31a0193a3371fd61 (patch) | |
tree | beb657b2cc6b4184d97a85502b29a291616a83ab /fs/ceph/caps.c | |
parent | ca81f3f6bd759f90a4b940cddda1f8bc61a7725a (diff) |
ceph: code cleanup
Mainly fixing minor issues reported by sparse.
Signed-off-by: Yehuda Sadeh <yehuda@hq.newdream.net>
Signed-off-by: Sage Weil <sage@newdream.net>
Diffstat (limited to 'fs/ceph/caps.c')
-rw-r--r-- | fs/ceph/caps.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c index dbf0d6a02a77..d992880d21d4 100644 --- a/fs/ceph/caps.c +++ b/fs/ceph/caps.c | |||
@@ -1194,6 +1194,8 @@ static int __send_cap(struct ceph_mds_client *mdsc, struct ceph_cap *cap, | |||
1194 | */ | 1194 | */ |
1195 | void __ceph_flush_snaps(struct ceph_inode_info *ci, | 1195 | void __ceph_flush_snaps(struct ceph_inode_info *ci, |
1196 | struct ceph_mds_session **psession) | 1196 | struct ceph_mds_session **psession) |
1197 | __releases(ci->vfs_inode->i_lock) | ||
1198 | __acquires(ci->vfs_inode->i_lock) | ||
1197 | { | 1199 | { |
1198 | struct inode *inode = &ci->vfs_inode; | 1200 | struct inode *inode = &ci->vfs_inode; |
1199 | int mds; | 1201 | int mds; |
@@ -1439,7 +1441,6 @@ static int try_nonblocking_invalidate(struct inode *inode) | |||
1439 | */ | 1441 | */ |
1440 | void ceph_check_caps(struct ceph_inode_info *ci, int flags, | 1442 | void ceph_check_caps(struct ceph_inode_info *ci, int flags, |
1441 | struct ceph_mds_session *session) | 1443 | struct ceph_mds_session *session) |
1442 | __releases(session->s_mutex) | ||
1443 | { | 1444 | { |
1444 | struct ceph_client *client = ceph_inode_to_client(&ci->vfs_inode); | 1445 | struct ceph_client *client = ceph_inode_to_client(&ci->vfs_inode); |
1445 | struct ceph_mds_client *mdsc = &client->mdsc; | 1446 | struct ceph_mds_client *mdsc = &client->mdsc; |
@@ -2256,8 +2257,7 @@ static void handle_cap_grant(struct inode *inode, struct ceph_mds_caps *grant, | |||
2256 | struct ceph_mds_session *session, | 2257 | struct ceph_mds_session *session, |
2257 | struct ceph_cap *cap, | 2258 | struct ceph_cap *cap, |
2258 | struct ceph_buffer *xattr_buf) | 2259 | struct ceph_buffer *xattr_buf) |
2259 | __releases(inode->i_lock) | 2260 | __releases(inode->i_lock) |
2260 | __releases(session->s_mutex) | ||
2261 | { | 2261 | { |
2262 | struct ceph_inode_info *ci = ceph_inode(inode); | 2262 | struct ceph_inode_info *ci = ceph_inode(inode); |
2263 | int mds = session->s_mds; | 2263 | int mds = session->s_mds; |