summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorSage Weil <sage@newdream.net>2011-05-03 09:28:08 -0700
committerSage Weil <sage@newdream.net>2011-05-03 09:28:08 -0700
commit3772d26d87efc2d91b2e4247e0001c89ed09a980 (patch)
tree940dc54f9daeef06185bcab96e2fc01c54a13355 /fs
parenta1b49cb7e2a7961ec3aa8b64860bf480d4ec9077 (diff)
downloadop-kernel-dev-3772d26d87efc2d91b2e4247e0001c89ed09a980.zip
op-kernel-dev-3772d26d87efc2d91b2e4247e0001c89ed09a980.tar.gz
ceph: use ihold() when i_lock is held
See 0444d76ae64fffc7851797fc1b6ebdbb44ac504a. Signed-off-by: Sage Weil <sage@newdream.net>
Diffstat (limited to 'fs')
-rw-r--r--fs/ceph/caps.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c
index 5323c33..010ba9c 100644
--- a/fs/ceph/caps.c
+++ b/fs/ceph/caps.c
@@ -1357,7 +1357,7 @@ void __ceph_mark_dirty_caps(struct ceph_inode_info *ci, int mask)
list_add(&ci->i_dirty_item, &mdsc->cap_dirty);
spin_unlock(&mdsc->cap_dirty_lock);
if (ci->i_flushing_caps == 0) {
- igrab(inode);
+ ihold(inode);
dirty |= I_DIRTY_SYNC;
}
}
@@ -1991,7 +1991,7 @@ static void __take_cap_refs(struct ceph_inode_info *ci, int got)
ci->i_wr_ref++;
if (got & CEPH_CAP_FILE_BUFFER) {
if (ci->i_wrbuffer_ref == 0)
- igrab(&ci->vfs_inode);
+ ihold(&ci->vfs_inode);
ci->i_wrbuffer_ref++;
dout("__take_cap_refs %p wrbuffer %d -> %d (?)\n",
&ci->vfs_inode, ci->i_wrbuffer_ref-1, ci->i_wrbuffer_ref);
OpenPOWER on IntegriCloud