summaryrefslogtreecommitdiffstats
path: root/fs/ceph
diff options
context:
space:
mode:
authorYan, Zheng <zheng.z.yan@intel.com>2014-04-01 14:34:18 +0200
committerSage Weil <sage@inktank.com>2014-04-05 06:08:25 +0200
commit48193012873e341f08de48304e32d0499b96c60b (patch)
tree1c8ae6c2b521818ee4d8dfbb5a57fa1f0d39fc3e /fs/ceph
parentceph: drop extra open file reference in ceph_atomic_open() (diff)
downloadlinux-48193012873e341f08de48304e32d0499b96c60b.tar.xz
linux-48193012873e341f08de48304e32d0499b96c60b.zip
ceph: don't grabs open file reference for aborted request
Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
Diffstat (limited to 'fs/ceph')
-rw-r--r--fs/ceph/inode.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c
index c9f25670e312..0b0728e5be2d 100644
--- a/fs/ceph/inode.c
+++ b/fs/ceph/inode.c
@@ -1112,7 +1112,7 @@ retry_lookup:
err = fill_inode(in, &rinfo->targeti, NULL,
session, req->r_request_started,
- (le32_to_cpu(rinfo->head->result) == 0) ?
+ (!req->r_aborted && rinfo->head->result == 0) ?
req->r_fmode : -1,
&req->r_caps_reservation);
if (err < 0) {