lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge tag 'for-linus-3.16-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs

Browse Source 
Pull 9p fixes from Eric Van Hensbergen:
 "Two bug fixes, one in xattr error path and the other in parsing
  major/minor numbers from devices"

* tag 'for-linus-3.16-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
  9P: fix return value in v9fs_fid_xattr_set
  fs/9p: adjust sscanf parameters accordingly to the variable types
This commit is contained in:
Linus Torvalds
2014-06-08 14:35:19 -07:00
parent 1662867a9b f15844e077
commit 963649d735
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fs/9p/vfs_inode.c
View File

@@ -147,7 +147,7 @@ static umode_t p9mode2unixmode(struct v9fs_session_info *v9ses,
int major = -1, minor = -1; int major = -1, minor = -1;
strlcpy(ext, stat->extension, sizeof(ext)); strlcpy(ext, stat->extension, sizeof(ext));
sscanf(ext, "%c %u %u", &type, &major, &minor); sscanf(ext, "%c %i %i", &type, &major, &minor);
switch (type) { switch (type) {
case 'c': case 'c':
res |= S_IFCHR; res |= S_IFCHR;

2
fs/9p/xattr.c
View File

@@ -156,7 +156,7 @@ int v9fs_fid_xattr_set(struct p9_fid *fid, const char *name,
offset += write_count; offset += write_count;
value_len -= write_count; value_len -= write_count;
} }
retval = offset; retval = 0;
err: err:
p9_client_clunk(fid); p9_client_clunk(fid);
return retval; return retval;