9p: fix return value in case in v9fs_fid_xattr_set()
PATCH 1/1 9p: fix return value in case in v9fs_fid_xattr_set()
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).
--- fs/9p/xattr.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
fs/9p/xattr.c +6 -4
@@ -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)
Signature · 1 line
1.8.4
2013/10/21 Geyslan G. Bem <[email protected]>:
Quoted 44 lines
In case of error in the
p9_client_write, the functionv9fs_fid_xattr_setshould return its negative value, what was never being done.In case of success it only retuned 0. Now it returns the 'offset' variable (
write_counttotal).Signed-off-by Geyslan G. Bem <[email protected]>--- fs/9p/xattr.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)fs/9p/xattr.c +6
-5@@ -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) --
Quoted 2 lines
1.8.4
Eric,
As you can see, I modified the success return value to the offset (write_count sum), following the same principle of v9fs_fid_xattr_get():
http://lxr.free-electrons.com/source/fs/9p/xattr.c#L65
What do you think?
Regards.