diff options
| author | Yan, Zheng <zheng.z.yan@intel.com> | 2014-04-27 03:17:45 +0200 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2014-04-28 21:55:41 +0200 |
| commit | 3bd58143bafc56dbc07f4f085e4d7e018d332674 (patch) | |
| tree | 46957a1a015cd412677851bc426fbdb92e92113b /fs | |
| parent | ceph: avoid releasing caps that are being used (diff) | |
| download | linux-3bd58143bafc56dbc07f4f085e4d7e018d332674.tar.xz linux-3bd58143bafc56dbc07f4f085e4d7e018d332674.zip | |
ceph: reserve caps for file layout/lock MDS requests
Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
Reviewed-by: Sage Weil <sage@inktank.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ceph/ioctl.c | 3 | ||||
| -rw-r--r-- | fs/ceph/locks.c | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/fs/ceph/ioctl.c b/fs/ceph/ioctl.c index efbe08289292..2042fd16d1a8 100644 --- a/fs/ceph/ioctl.c +++ b/fs/ceph/ioctl.c @@ -110,6 +110,8 @@ static long ceph_ioctl_set_layout(struct file *file, void __user *arg) return PTR_ERR(req); req->r_inode = inode; ihold(inode); + req->r_num_caps = 1; + req->r_inode_drop = CEPH_CAP_FILE_SHARED | CEPH_CAP_FILE_EXCL; req->r_args.setlayout.layout.fl_stripe_unit = @@ -154,6 +156,7 @@ static long ceph_ioctl_set_layout_policy (struct file *file, void __user *arg) return PTR_ERR(req); req->r_inode = inode; ihold(inode); + req->r_num_caps = 1; req->r_args.setlayout.layout.fl_stripe_unit = cpu_to_le32(l.stripe_unit); diff --git a/fs/ceph/locks.c b/fs/ceph/locks.c index d94ba0df9f4d..191398852a2e 100644 --- a/fs/ceph/locks.c +++ b/fs/ceph/locks.c @@ -45,6 +45,7 @@ static int ceph_lock_message(u8 lock_type, u16 operation, struct file *file, return PTR_ERR(req); req->r_inode = inode; ihold(inode); + req->r_num_caps = 1; /* mds requires start and length rather than start and end */ if (LLONG_MAX == fl->fl_end) |