diff options
| author | piaojun <piaojun@huawei.com> | 2018-07-25 06:13:16 +0300 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2018-12-17 01:08:43 +0300 |
| commit | bd531ebf1538b1387cc93545ca647e54a1ff66bc (patch) | |
| tree | 6b71c14d163507e03d51ca9b879ccc55465bd937 /fs/9p/xattr.c | |
| parent | 8aeafabdf4f5db429858c140361674ac57c2b54d (diff) | |
| download | linux-bd531ebf1538b1387cc93545ca647e54a1ff66bc.tar.xz | |
fs/9p/xattr.c: catch the error of p9_client_clunk when setting xattr failed
commit 3111784bee81591ea2815011688d28b65df03627 upstream.
In my testing, v9fs_fid_xattr_set will return successfully even if the
backend ext4 filesystem has no space to store xattr key-value. That will
cause inconsistent behavior between front end and back end. The reason is
that lsetxattr will be triggered by p9_client_clunk, and unfortunately we
did not catch the error. This patch will catch the error to notify upper
caller.
p9_client_clunk (in 9p)
p9_client_rpc(clnt, P9_TCLUNK, "d", fid->fid);
v9fs_clunk (in qemu)
put_fid
free_fid
v9fs_xattr_fid_clunk
v9fs_co_lsetxattr
s->ops->lsetxattr
ext4_xattr_user_set (in host ext4 filesystem)
Link: http://lkml.kernel.org/r/5B57EACC.2060900@huawei.com
Signed-off-by: Jun Piao <piaojun@huawei.com>
Cc: Eric Van Hensbergen <ericvh@gmail.com>
Cc: Ron Minnich <rminnich@sandia.gov>
Cc: Latchesar Ionkov <lucho@ionkov.net>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Dominique Martinet <dominique.martinet@cea.fr>
[bwh: Backported to 3.16: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'fs/9p/xattr.c')
| -rw-r--r-- | fs/9p/xattr.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/9p/xattr.c b/fs/9p/xattr.c index f95e01e058e4..4062a715f6fc 100644 --- a/fs/9p/xattr.c +++ b/fs/9p/xattr.c @@ -121,7 +121,7 @@ int v9fs_fid_xattr_set(struct p9_fid *fid, const char *name, const void *value, size_t value_len, int flags) { u64 offset = 0; - int retval, msize, write_count; + int retval, err, msize, write_count; p9_debug(P9_DEBUG_VFS, "name = %s value_len = %zu flags = %d\n", name, value_len, flags); @@ -158,7 +158,9 @@ int v9fs_fid_xattr_set(struct p9_fid *fid, const char *name, } retval = 0; err: - p9_client_clunk(fid); + err = p9_client_clunk(fid); + if (!retval && err) + retval = err; return retval; } |