diff options
| author | Sage Weil <sage@newdream.net> | 2011-05-27 09:24:26 -0700 |
|---|---|---|
| committer | Sage Weil <sage@newdream.net> | 2011-06-07 21:34:11 -0700 |
| commit | 70b666c3b4cb2b96098d80e6f515e4bc6d37db5a (patch) | |
| tree | dd82036114adf9d0c28120500d58833cacfbc004 /fs/ceph/ioctl.c | |
| parent | db3540522e955c1ebb391f4f5324dff4f20ecd09 (diff) | |
| download | linux-stable-70b666c3b4cb2b96098d80e6f515e4bc6d37db5a.tar.gz linux-stable-70b666c3b4cb2b96098d80e6f515e4bc6d37db5a.tar.bz2 linux-stable-70b666c3b4cb2b96098d80e6f515e4bc6d37db5a.zip | |
ceph: use ihold when we already have an inode ref
We should use ihold whenever we already have a stable inode ref, even
when we aren't holding i_lock. This avoids adding new and unnecessary
locking dependencies.
Signed-off-by: Sage Weil <sage@newdream.net>
Diffstat (limited to 'fs/ceph/ioctl.c')
| -rw-r--r-- | fs/ceph/ioctl.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/ceph/ioctl.c b/fs/ceph/ioctl.c index 8888c9ba68db..ef0b5f48e13a 100644 --- a/fs/ceph/ioctl.c +++ b/fs/ceph/ioctl.c @@ -73,7 +73,8 @@ static long ceph_ioctl_set_layout(struct file *file, void __user *arg) USE_AUTH_MDS); if (IS_ERR(req)) return PTR_ERR(req); - req->r_inode = igrab(inode); + req->r_inode = inode; + ihold(inode); req->r_inode_drop = CEPH_CAP_FILE_SHARED | CEPH_CAP_FILE_EXCL; req->r_args.setlayout.layout.fl_stripe_unit = @@ -135,7 +136,8 @@ static long ceph_ioctl_set_layout_policy (struct file *file, void __user *arg) if (IS_ERR(req)) return PTR_ERR(req); - req->r_inode = igrab(inode); + req->r_inode = inode; + ihold(inode); req->r_args.setlayout.layout.fl_stripe_unit = cpu_to_le32(l.stripe_unit); |