Commit bd779669 authored Sep 05, 2015 by Linus Torvalds

Merge tag 'for-linus-4.3-merge-window-part-1' of...

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

Pull 9p updates from Eric Van Hensbergen:
 "Just a few cleanups for 4.3 merge window for the 9p file system.  I've
  gotten several more over the past week, but this group has been in
  for-next for at least a couple of weeks so I figured I'd push them
  first while I test the rest.

  Most of the ones not in this set are bug-fixes anyways so I could hold
  them for rc1"

* tag 'for-linus-4.3-merge-window-part-1' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
  9p: fix return code of read() when count is 0
  9p: remove unused option Opt_trans

parents 9cfcc658 b5ac1fb2

fs/9p/v9fs.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -52,7 +52,7 @@ enum {
		/* Options that take integer arguments */
		Opt_debug, Opt_dfltuid, Opt_dfltgid, Opt_afid,
		/* String options */
		Opt_uname, Opt_remotename, Opt_trans, Opt_cache, Opt_cachetag,
		Opt_uname, Opt_remotename, Opt_cache, Opt_cachetag,
		/* Options that take no arguments */
		Opt_nodevmap,
		/* Cache options */

fs/9p/vfs_file.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -381,7 +381,7 @@ static ssize_t
		v9fs_file_read_iter(struct kiocb iocb, struct iov_iter to)
		{
		struct p9_fid *fid = iocb->ki_filp->private_data;
		int ret, err;
		int ret, err = 0;

		p9_debug(P9_DEBUG_VFS, "count %zu offset %lld\n",
		iov_iter_count(to), iocb->ki_pos);