summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorYan, Zheng <zheng.z.yan@intel.com>2013-02-21 13:43:55 +0800
committerSage Weil <sage@inktank.com>2013-05-01 21:14:30 -0700
commit8a034497005491dc91ed7bfd660b04923d35d0e6 (patch)
tree170b3748ae060a787fd4352186f80d69b778d8d3 /fs
parentf51a822c315e9d4c4c67247bea10e4b8eb795af1 (diff)
downloadlinux-stable-8a034497005491dc91ed7bfd660b04923d35d0e6.tar.gz
linux-stable-8a034497005491dc91ed7bfd660b04923d35d0e6.tar.bz2
linux-stable-8a034497005491dc91ed7bfd660b04923d35d0e6.zip
ceph: fix LSSNAP regression
commit 6e8575faa8 makes parse_reply_info_extra() return -EIO for LSSNAP Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com> Reviewed-by: Greg Farnum <greg@inktank.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/ceph/mds_client.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c
index 5c17705f88b1..6e67a3501673 100644
--- a/fs/ceph/mds_client.c
+++ b/fs/ceph/mds_client.c
@@ -265,7 +265,8 @@ static int parse_reply_info_extra(void **p, void *end,
{
if (info->head->op == CEPH_MDS_OP_GETFILELOCK)
return parse_reply_info_filelock(p, end, info, features);
- else if (info->head->op == CEPH_MDS_OP_READDIR)
+ else if (info->head->op == CEPH_MDS_OP_READDIR ||
+ info->head->op == CEPH_MDS_OP_LSSNAP)
return parse_reply_info_dir(p, end, info, features);
else if (info->head->op == CEPH_MDS_OP_CREATE)
return parse_reply_info_create(p, end, info, features);