]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
9p: fix return value in case in v9fs_fid_xattr_set()
authorGeyslan G. Bem <geyslan@gmail.com>
Mon, 21 Oct 2013 19:47:58 +0000 (16:47 -0300)
committerEric Van Hensbergen <ericvh@gmail.com>
Sat, 23 Nov 2013 22:10:31 +0000 (16:10 -0600)
In case of error in the p9_client_write, the function v9fs_fid_xattr_set
should return its negative value, what was never being done.

In case of success it only retuned 0. Now it returns the 'offset'
variable (write_count total).

Signed-off-by: Geyslan G. Bem <geyslan@gmail.com>
Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>
fs/9p/xattr.c

index 3c28cdfb8c477b65269c1a26957cb4942d10344f..04133a1fd9cbea42585f530b56bb73f93b1bd1dc 100644 (file)
@@ -138,8 +138,7 @@ int v9fs_fid_xattr_set(struct p9_fid *fid, const char *name,
        if (retval < 0) {
                p9_debug(P9_DEBUG_VFS, "p9_client_xattrcreate failed %d\n",
                         retval);
-               p9_client_clunk(fid);
-               return retval;
+               goto err;
        }
        msize = fid->clnt->msize;
        while (value_len) {
@@ -152,12 +151,15 @@ int v9fs_fid_xattr_set(struct p9_fid *fid, const char *name,
                if (write_count < 0) {
                        /* error in xattr write */
                        retval = write_count;
-                       break;
+                       goto err;
                }
                offset += write_count;
                value_len -= write_count;
        }
-       return p9_client_clunk(fid);
+       retval = offset;
+err:
+       p9_client_clunk(fid);
+       return retval;
 }
 
 ssize_t v9fs_listxattr(struct dentry *dentry, char *buffer, size_t buffer_size)