Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull vfs updates from Al Viro:
 "The first vfs pile, with deep apologies for being very late in this
  window.

  Assorted cleanups and fixes, plus a large preparatory part of iov_iter
  work.  There's a lot more of that, but it'll probably go into the next
  merge window - it *does* shape up nicely, removes a lot of
  boilerplate, gets rid of locking inconsistencie between aio_write and
  splice_write and I hope to get Kent's direct-io rewrite merged into
  the same queue, but some of the stuff after this point is having
  (mostly trivial) conflicts with the things already merged into
  mainline and with some I want more testing.

  This one passes LTP and xfstests without regressions, in addition to
  usual beating.  BTW, readahead02 in ltp syscalls testsuite has started
  giving failures since "mm/readahead.c: fix readahead failure for
  memoryless NUMA nodes and limit readahead pages" - might be a false
  positive, might be a real regression..."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (63 commits)
  missing bits of "splice: fix racy pipe->buffers uses"
  cifs: fix the race in cifs_writev()
  ceph_sync_{,direct_}write: fix an oops on ceph_osdc_new_request() failure
  kill generic_file_buffered_write()
  ocfs2_file_aio_write(): switch to generic_perform_write()
  ceph_aio_write(): switch to generic_perform_write()
  xfs_file_buffered_aio_write(): switch to generic_perform_write()
  export generic_perform_write(), start getting rid of generic_file_buffer_write()
  generic_file_direct_write(): get rid of ppos argument
  btrfs_file_aio_write(): get rid of ppos
  kill the 5th argument of generic_file_buffered_write()
  kill the 4th argument of __generic_file_aio_write()
  lustre: don't open-code kernel_recvmsg()
  ocfs2: don't open-code kernel_recvmsg()
  drbd: don't open-code kernel_recvmsg()
  constify blk_rq_map_user_iov() and friends
  lustre: switch to kernel_sendmsg()
  ocfs2: don't open-code kernel_sendmsg()
  take iov_iter stuff to mm/iov_iter.c
  process_vm_access: tidy up a bit
  ...

2 files changed, 12 insertions, 40 deletions

diff --git a/fs/ncpfs/inode.c b/fs/ncpfs/inode.c
index 81b4f643ecef..e31e589369a4 100644
--- a/fs/ncpfs/inode.c
+++ b/fs/ncpfs/inode.c
@@ -470,9 +470,7 @@ static int ncp_fill_super(struct super_block *sb, void *raw_data, int silent)
 {
         struct ncp_mount_data_kernel data;
         struct ncp_server *server;
-        struct file *ncp_filp;
         struct inode *root_inode;
-        struct inode *sock_inode;
         struct socket *sock;
         int error;
         int default_bufsize;
@@ -541,18 +539,10 @@ static int ncp_fill_super(struct super_block *sb, void *raw_data, int silent)
         if (!uid_valid(data.mounted_uid) || !uid_valid(data.uid) ||
             !gid_valid(data.gid))
                 goto out;
-        error = -EBADF;
-        ncp_filp = fget(data.ncp_fd);
-        if (!ncp_filp)
-                goto out;
-        error = -ENOTSOCK;
-        sock_inode = file_inode(ncp_filp);
-        if (!S_ISSOCK(sock_inode->i_mode))
-                goto out_fput;
-        sock = SOCKET_I(sock_inode);
+        sock = sockfd_lookup(data.ncp_fd, &error);
         if (!sock)
-                goto out_fput;
-                
+                goto out;
+
         if (sock->type == SOCK_STREAM)
                 default_bufsize = 0xF000;
         else
@@ -574,27 +564,16 @@ static int ncp_fill_super(struct super_block *sb, void *raw_data, int silent)
         if (error)
                 goto out_fput;
 
-        server->ncp_filp = ncp_filp;
         server->ncp_sock = sock;
         
         if (data.info_fd != -1) {
-                struct socket *info_sock;
-
-                error = -EBADF;
-                server->info_filp = fget(data.info_fd);
-                if (!server->info_filp)
-                        goto out_bdi;
-                error = -ENOTSOCK;
-                sock_inode = file_inode(server->info_filp);
-                if (!S_ISSOCK(sock_inode->i_mode))
-                        goto out_fput2;
-                info_sock = SOCKET_I(sock_inode);
+                struct socket *info_sock = sockfd_lookup(data.info_fd, &error);
                 if (!info_sock)
-                        goto out_fput2;
+                        goto out_bdi;
+                server->info_sock = info_sock;
                 error = -EBADFD;
                 if (info_sock->type != SOCK_STREAM)
                         goto out_fput2;
-                server->info_sock = info_sock;
         }
 
 /*      server->lock = 0;       */
@@ -766,17 +745,12 @@ out_nls:
         mutex_destroy(&server->root_setup_lock);
         mutex_destroy(&server->mutex);
 out_fput2:
-        if (server->info_filp)
-                fput(server->info_filp);
+        if (server->info_sock)
+                sockfd_put(server->info_sock);
 out_bdi:
         bdi_destroy(&server->bdi);
 out_fput:
-        /* 23/12/1998 Marcin Dalecki <dalecki@cs.net.pl>:
-         * 
-         * The previously used put_filp(ncp_filp); was bogus, since
-         * it doesn't perform proper unlocking.
-         */
-        fput(ncp_filp);
+        sockfd_put(sock);
 out:
         put_pid(data.wdog_pid);
         sb->s_fs_info = NULL;
@@ -809,9 +783,9 @@ static void ncp_put_super(struct super_block *sb)
         mutex_destroy(&server->root_setup_lock);
         mutex_destroy(&server->mutex);
 
-        if (server->info_filp)
-                fput(server->info_filp);
-        fput(server->ncp_filp);
+        if (server->info_sock)
+                sockfd_put(server->info_sock);
+        sockfd_put(server->ncp_sock);
         kill_pid(server->m.wdog_pid, SIGTERM, 1);
         put_pid(server->m.wdog_pid);
 
diff --git a/fs/ncpfs/ncp_fs_sb.h b/fs/ncpfs/ncp_fs_sb.h
index b81e97adc5a9..7fa17e459366 100644
--- a/fs/ncpfs/ncp_fs_sb.h
+++ b/fs/ncpfs/ncp_fs_sb.h
@@ -45,9 +45,7 @@ struct ncp_server {
 
         __u8 name_space[NCP_NUMBER_OF_VOLUMES + 2];
 
-        struct file *ncp_filp;  /* File pointer to ncp socket */
         struct socket *ncp_sock;/* ncp socket */
-        struct file *info_filp;
         struct socket *info_sock;
 
         u8 sequence;