BMC/Intel-BMC/linux.git/fs/9p/vfs_file.c, branch dev

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

2015-04-18T21:45:30+00:00

Pull 9pfs updates from Eric Van Hensbergen: "Some accumulated cleanup patches for kerneldoc and unused variables as well as some lock bug fixes and adding privateport option for RDMA" * tag 'for-linus-4.1-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs: net/9p: add a privport option for RDMA transport. fs/9p: Initialize status in v9fs_file_do_lock. net/9p: Initialize opts->privport as it should be. net/9p: use memcpy() instead of snprintf() in p9_mount_tag_show() 9p: use unsigned integers for nwqid/count 9p: do not crash on unknown lock status code 9p: fix error handling in v9fs_file_do_lock 9p: remove unused variable in p9_fd_create() 9p: kerneldoc warning fixes

switch generic_write_checks() to iocb and iter

2015-04-12T02:30:21+00:00

... returning -E... upon error and amount of data left in iter after (possible) truncation upon success. Note, that normal case gives a non-zero (positive) return value, so any tests for != 0 _must_ be updated. Signed-off-by: Al Viro Conflicts: fs/ext4/file.c

generic_write_checks(): drop isblk argument

2015-04-12T02:29:48+00:00

all remaining callers are passing 0; some just obscure that fact. Signed-off-by: Al Viro

make new_sync_{read,write}() static

2015-04-12T02:29:40+00:00

All places outside of core VFS that checked ->read and ->write for being NULL or called the methods directly are gone now, so NULL {read,write} with non-NULL {read,write}_iter will do the right thing in all cases. Signed-off-by: Al Viro

9p: we are leaking glock.client_id in v9fs_file_getlock()

2015-04-12T02:28:28+00:00

Signed-off-by: Al Viro

9p: switch to ->read_iter/->write_iter

2015-04-12T02:28:28+00:00

Signed-off-by: Al Viro

9p: get rid of v9fs_direct_file_read()

2015-04-12T02:28:27+00:00

do it in ->direct_IO()... Signed-off-by: Al Viro

9p: switch p9_client_read() to passing struct iov_iter *

2015-04-12T02:28:27+00:00

... and make it loop Signed-off-by: Al Viro

9p: get rid of v9fs_direct_file_write()

2015-04-12T02:28:26+00:00

just handle it in ->direct_IO() Signed-off-by: Al Viro

9p: fold v9fs_file_write_internal() into the caller

2015-04-12T02:28:26+00:00

Signed-off-by: Al Viro