diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-05 20:33:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-05 20:33:10 -0700 |
| commit | bd779669945ed9982890da789ad32e3bd0d41f14 (patch) | |
| tree | 533868e890b6ff2751abf5c4072c105e25e4a4eb | |
| parent | 9cfcc658da9693f65e7224e8329e40ada2f3c699 (diff) | |
| parent | b5ac1fb2717e48177d3f73f9e4c9b556c0a24c6b (diff) | |
| download | linux-bd779669945ed9982890da789ad32e3bd0d41f14.tar.gz linux-bd779669945ed9982890da789ad32e3bd0d41f14.tar.bz2 linux-bd779669945ed9982890da789ad32e3bd0d41f14.zip | |
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
| -rw-r--r-- | fs/9p/v9fs.c | 2 | ||||
| -rw-r--r-- | fs/9p/vfs_file.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/9p/v9fs.c b/fs/9p/v9fs.c index 8aa56bb6e861..6caca025019d 100644 --- a/fs/9p/v9fs.c +++ b/fs/9p/v9fs.c @@ -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 */ diff --git a/fs/9p/vfs_file.c b/fs/9p/vfs_file.c index 1ef16bd8280b..3abc447783aa 100644 --- a/fs/9p/vfs_file.c +++ b/fs/9p/vfs_file.c @@ -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); |