diff options
| author | Sage Weil <sage@newdream.net> | 2010-02-22 13:59:00 -0800 |
|---|---|---|
| committer | Sage Weil <sage@newdream.net> | 2010-02-23 14:26:35 -0800 |
| commit | a6369741c48815fedfce7072b7a9cd98b5bafd56 (patch) | |
| tree | dd9ce7da7a6c5556d6c7731423dff0824aad9545 /fs | |
| parent | 4ce1e9adabbad8f2c45ceeeb6de56cc368484297 (diff) | |
| download | linux-stable-a6369741c48815fedfce7072b7a9cd98b5bafd56.tar.gz linux-stable-a6369741c48815fedfce7072b7a9cd98b5bafd56.tar.bz2 linux-stable-a6369741c48815fedfce7072b7a9cd98b5bafd56.zip | |
ceph: fix comments, locking in destroy_inode
The destroy_inode path needs no inode locks since there are no
inode references. Update __ceph_remove_cap comment to reflect
that it is called without cap->session->s_mutex in this case.
Signed-off-by: Sage Weil <sage@newdream.net>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ceph/caps.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c index 289f6c65a17e..b6154ffe70df 100644 --- a/fs/ceph/caps.c +++ b/fs/ceph/caps.c @@ -856,8 +856,8 @@ static int __ceph_is_any_caps(struct ceph_inode_info *ci) } /* - * caller should hold i_lock, and session s_mutex. - * returns true if this is the last cap. if so, caller should iput. + * caller should hold i_lock. + * caller will not hold session s_mutex if called from destroy_inode. */ void __ceph_remove_cap(struct ceph_cap *cap) { @@ -974,15 +974,14 @@ static int send_cap_msg(struct ceph_mds_session *session, } /* - * Queue cap releases when an inode is dropped from our - * cache. + * Queue cap releases when an inode is dropped from our cache. Since + * inode is about to be destroyed, there is no need for i_lock. */ void ceph_queue_caps_release(struct inode *inode) { struct ceph_inode_info *ci = ceph_inode(inode); struct rb_node *p; - spin_lock(&inode->i_lock); p = rb_first(&ci->i_caps); while (p) { struct ceph_cap *cap = rb_entry(p, struct ceph_cap, ci_node); @@ -1024,9 +1023,7 @@ void ceph_queue_caps_release(struct inode *inode) spin_unlock(&session->s_cap_lock); p = rb_next(p); __ceph_remove_cap(cap); - } - spin_unlock(&inode->i_lock); } /* |