evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ceph: fix comments, locking in destroy_inode

Browse source 
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>
This commit is contained in:
Sage Weil 2010-02-22 13:59:00 -08:00
parent 4ce1e9adab
commit a6369741c4
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
fs/ceph/caps.c
View file

@ -856,8 +856,8 @@ static int __ceph_is_any_caps(struct ceph_inode_info *ci)
} }
/* /*
* caller should hold i_lock, and session s_mutex. * caller should hold i_lock.
* returns true if this is the last cap. if so, caller should iput. * caller will not hold session s_mutex if called from destroy_inode.
*/ */
void __ceph_remove_cap(struct ceph_cap *cap) 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 * Queue cap releases when an inode is dropped from our cache. Since
* cache. * inode is about to be destroyed, there is no need for i_lock.
*/ */
void ceph_queue_caps_release(struct inode *inode) void ceph_queue_caps_release(struct inode *inode)
{ {
struct ceph_inode_info *ci = ceph_inode(inode); struct ceph_inode_info *ci = ceph_inode(inode);
struct rb_node *p; struct rb_node *p;
spin_lock(&inode->i_lock);
p = rb_first(&ci->i_caps); p = rb_first(&ci->i_caps);
while (p) { while (p) {
struct ceph_cap *cap = rb_entry(p, struct ceph_cap, ci_node); 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); spin_unlock(&session->s_cap_lock);
p = rb_next(p); p = rb_next(p);
__ceph_remove_cap(cap); __ceph_remove_cap(cap);
} }
spin_unlock(&inode->i_lock);
} }
/* /*