Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 963649d7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus-3.16-merge-window' of... 

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

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
parents 1662867a f15844e0

fs/9p/vfs_inode.c

+1 −1
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ static umode_t p9mode2unixmode(struct v9fs_session_info *v9ses, 
		int major = -1, minor = -1;



		strlcpy(ext, stat->extension, sizeof(ext));

		sscanf(ext, "%c %u %u", &type, &major, &minor);

		sscanf(ext, "%c %i %i", &type, &major, &minor);

		switch (type) {

		case 'c':

			res |= S_IFCHR;

fs/9p/xattr.c

+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ int v9fs_fid_xattr_set(struct p9_fid *fid, const char *name, 
		offset += write_count;

		value_len -= write_count;

	}

	retval = offset;

	retval = 0;

err:

	p9_client_clunk(fid);

	return retval;