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

Pull VFS changes from Al Viro:
 "First pile out of several (there _definitely_ will be more).  Stuff in
  this one:

   - unification of d_splice_alias()/d_materialize_unique()

   - iov_iter rewrite

   - killing a bunch of ->f_path.dentry users (and f_dentry macro).

     Getting that completed will make life much simpler for
     unionmount/overlayfs, since then we'll be able to limit the places
     sensitive to file _dentry_ to reasonably few.  Which allows to have
     file_inode(file) pointing to inode in a covered layer, with dentry
     pointing to (negative) dentry in union one.

     Still not complete, but much closer now.

   - crapectomy in lustre (dead code removal, mostly)

   - "let's make seq_printf return nothing" preparations

   - assorted cleanups and fixes

  There _definitely_ will be more piles"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (63 commits)
  copy_from_iter_nocache()
  new helper: iov_iter_kvec()
  csum_and_copy_..._iter()
  iov_iter.c: handle ITER_KVEC directly
  iov_iter.c: convert copy_to_iter() to iterate_and_advance
  iov_iter.c: convert copy_from_iter() to iterate_and_advance
  iov_iter.c: get rid of bvec_copy_page_{to,from}_iter()
  iov_iter.c: convert iov_iter_zero() to iterate_and_advance
  iov_iter.c: convert iov_iter_get_pages_alloc() to iterate_all_kinds
  iov_iter.c: convert iov_iter_get_pages() to iterate_all_kinds
  iov_iter.c: convert iov_iter_npages() to iterate_all_kinds
  iov_iter.c: iterate_and_advance
  iov_iter.c: macros for iterating over iov_iter
  kill f_dentry macro
  dcache: fix kmemcheck warning in switch_names
  new helper: audit_file()
  nfsd_vfs_write(): use file_inode()
  ncpfs: use file_inode()
  kill f_dentry uses
  lockd: get rid of ->f_path.dentry->d_sb
  ...

5 files changed, 31 insertions, 35 deletions

diff --git a/fs/nfsd/nfs4recover.c b/fs/nfsd/nfs4recover.c
index a25490ae6c62..cc6a76072009 100644
--- a/fs/nfsd/nfs4recover.c
+++ b/fs/nfsd/nfs4recover.c
@@ -245,10 +245,11 @@ struct nfs4_dir_ctx {
 };
 
 static int
-nfsd4_build_namelist(void *arg, const char *name, int namlen,
+nfsd4_build_namelist(struct dir_context *__ctx, const char *name, int namlen,
                 loff_t offset, u64 ino, unsigned int d_type)
 {
-        struct nfs4_dir_ctx *ctx = arg;
+        struct nfs4_dir_ctx *ctx =
+                container_of(__ctx, struct nfs4_dir_ctx, ctx);
         struct name_list *entry;
 
         if (namlen != HEXDIR_LEN - 1)
@@ -704,7 +705,7 @@ cld_pipe_downcall(struct file *filp, const char __user *src, size_t mlen)
         struct cld_upcall *tmp, *cup;
         struct cld_msg __user *cmsg = (struct cld_msg __user *)src;
         uint32_t xid;
-        struct nfsd_net *nn = net_generic(filp->f_dentry->d_sb->s_fs_info,
+        struct nfsd_net *nn = net_generic(file_inode(filp)->i_sb->s_fs_info,
                                                 nfsd_net_id);
         struct cld_net *cn = nn->cld_net;
 
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index eeea7a90eb87..b1eed4dd2eab 100644
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -1886,7 +1886,7 @@ static __be32 nfsd4_encode_path(struct xdr_stream *xdr,
                         goto out_free;
                 }
                 p = xdr_encode_opaque(p, dentry->d_name.name, len);
-                dprintk("/%s", dentry->d_name.name);
+                dprintk("/%pd", dentry);
                 spin_unlock(&dentry->d_lock);
                 dput(dentry);
                 ncomponents--;
diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c
index ca73ca79a0ee..9506ea565610 100644
--- a/fs/nfsd/nfsctl.c
+++ b/fs/nfsd/nfsctl.c
@@ -231,6 +231,10 @@ static struct file_operations reply_cache_stats_operations = {
  * payload - write methods
  */
 
+static inline struct net *netns(struct file *file)
+{
+        return file_inode(file)->i_sb->s_fs_info;
+}
 
 /**
  * write_unlock_ip - Release all locks used by a client
@@ -252,7 +256,7 @@ static ssize_t write_unlock_ip(struct file *file, char *buf, size_t size)
         struct sockaddr *sap = (struct sockaddr *)&address;
         size_t salen = sizeof(address);
         char *fo_path;
-        struct net *net = file->f_dentry->d_sb->s_fs_info;
+        struct net *net = netns(file);
 
         /* sanity check */
         if (size == 0)
@@ -350,7 +354,6 @@ static ssize_t write_filehandle(struct file *file, char *buf, size_t size)
         int len;
         struct auth_domain *dom;
         struct knfsd_fh fh;
-        struct net *net = file->f_dentry->d_sb->s_fs_info;
 
         if (size == 0)
                 return -EINVAL;
@@ -385,7 +388,7 @@ static ssize_t write_filehandle(struct file *file, char *buf, size_t size)
         if (!dom)
                 return -ENOMEM;
 
-        len = exp_rootfh(net, dom, path, &fh,  maxsize);
+        len = exp_rootfh(netns(file), dom, path, &fh,  maxsize);
         auth_domain_put(dom);
         if (len)
                 return len;
@@ -429,7 +432,7 @@ static ssize_t write_threads(struct file *file, char *buf, size_t size)
 {
         char *mesg = buf;
         int rv;
-        struct net *net = file->f_dentry->d_sb->s_fs_info;
+        struct net *net = netns(file);
 
         if (size > 0) {
                 int newthreads;
@@ -480,7 +483,7 @@ static ssize_t write_pool_threads(struct file *file, char *buf, size_t size)
         int len;
         int npools;
         int *nthreads;
-        struct net *net = file->f_dentry->d_sb->s_fs_info;
+        struct net *net = netns(file);
 
         mutex_lock(&nfsd_mutex);
         npools = nfsd_nrpools(net);
@@ -543,8 +546,7 @@ static ssize_t __write_versions(struct file *file, char *buf, size_t size)
         unsigned minor;
         ssize_t tlen = 0;
         char *sep;
-        struct net *net = file->f_dentry->d_sb->s_fs_info;
-        struct nfsd_net *nn = net_generic(net, nfsd_net_id);
+        struct nfsd_net *nn = net_generic(netns(file), nfsd_net_id);
 
         if (size>0) {
                 if (nn->nfsd_serv)
@@ -830,10 +832,9 @@ static ssize_t __write_ports(struct file *file, char *buf, size_t size,
 static ssize_t write_ports(struct file *file, char *buf, size_t size)
 {
         ssize_t rv;
-        struct net *net = file->f_dentry->d_sb->s_fs_info;
 
         mutex_lock(&nfsd_mutex);
-        rv = __write_ports(file, buf, size, net);
+        rv = __write_ports(file, buf, size, netns(file));
         mutex_unlock(&nfsd_mutex);
         return rv;
 }
@@ -865,8 +866,7 @@ int nfsd_max_blksize;
 static ssize_t write_maxblksize(struct file *file, char *buf, size_t size)
 {
         char *mesg = buf;
-        struct net *net = file->f_dentry->d_sb->s_fs_info;
-        struct nfsd_net *nn = net_generic(net, nfsd_net_id);
+        struct nfsd_net *nn = net_generic(netns(file), nfsd_net_id);
 
         if (size > 0) {
                 int bsize;
@@ -915,8 +915,7 @@ static ssize_t write_maxblksize(struct file *file, char *buf, size_t size)
 static ssize_t write_maxconn(struct file *file, char *buf, size_t size)
 {
         char *mesg = buf;
-        struct net *net = file->f_dentry->d_sb->s_fs_info;
-        struct nfsd_net *nn = net_generic(net, nfsd_net_id);
+        struct nfsd_net *nn = net_generic(netns(file), nfsd_net_id);
         unsigned int maxconn = nn->max_connections;
 
         if (size > 0) {
@@ -997,8 +996,7 @@ static ssize_t nfsd4_write_time(struct file *file, char *buf, size_t size,
  */
 static ssize_t write_leasetime(struct file *file, char *buf, size_t size)
 {
-        struct net *net = file->f_dentry->d_sb->s_fs_info;
-        struct nfsd_net *nn = net_generic(net, nfsd_net_id);
+        struct nfsd_net *nn = net_generic(netns(file), nfsd_net_id);
         return nfsd4_write_time(file, buf, size, &nn->nfsd4_lease, nn);
 }
 
@@ -1014,8 +1012,7 @@ static ssize_t write_leasetime(struct file *file, char *buf, size_t size)
  */
 static ssize_t write_gracetime(struct file *file, char *buf, size_t size)
 {
-        struct net *net = file->f_dentry->d_sb->s_fs_info;
-        struct nfsd_net *nn = net_generic(net, nfsd_net_id);
+        struct nfsd_net *nn = net_generic(netns(file), nfsd_net_id);
         return nfsd4_write_time(file, buf, size, &nn->nfsd4_grace, nn);
 }
 
@@ -1071,8 +1068,7 @@ static ssize_t __write_recoverydir(struct file *file, char *buf, size_t size,
 static ssize_t write_recoverydir(struct file *file, char *buf, size_t size)
 {
         ssize_t rv;
-        struct net *net = file->f_dentry->d_sb->s_fs_info;
-        struct nfsd_net *nn = net_generic(net, nfsd_net_id);
+        struct nfsd_net *nn = net_generic(netns(file), nfsd_net_id);
 
         mutex_lock(&nfsd_mutex);
         rv = __write_recoverydir(file, buf, size, nn);
@@ -1102,8 +1098,7 @@ static ssize_t write_recoverydir(struct file *file, char *buf, size_t size)
  */
 static ssize_t write_v4_end_grace(struct file *file, char *buf, size_t size)
 {
-        struct net *net = file->f_dentry->d_sb->s_fs_info;
-        struct nfsd_net *nn = net_generic(net, nfsd_net_id);
+        struct nfsd_net *nn = net_generic(netns(file), nfsd_net_id);
 
         if (size > 0) {
                 switch(buf[0]) {
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
index 989129e2d6ea..0a82e3c033ee 100644
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
@@ -930,7 +930,6 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
                                 unsigned long *cnt, int *stablep)
 {
         struct svc_export       *exp;
-        struct dentry           *dentry;
         struct inode            *inode;
         mm_segment_t            oldfs;
         __be32                  err = 0;
@@ -949,8 +948,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
                  */
                 current->flags |= PF_LESS_THROTTLE;
 
-        dentry = file->f_path.dentry;
-        inode = dentry->d_inode;
+        inode = file_inode(file);
         exp   = fhp->fh_export;
 
         use_wgather = (rqstp->rq_vers == 2) && EX_WGATHER(exp);
@@ -1819,10 +1817,12 @@ struct readdir_data {
         int             full;
 };
 
-static int nfsd_buffered_filldir(void *__buf, const char *name, int namlen,
-                                 loff_t offset, u64 ino, unsigned int d_type)
+static int nfsd_buffered_filldir(struct dir_context *ctx, const char *name,
+                                 int namlen, loff_t offset, u64 ino,
+                                 unsigned int d_type)
 {
-        struct readdir_data *buf = __buf;
+        struct readdir_data *buf =
+                container_of(ctx, struct readdir_data, ctx);
         struct buffered_dirent *de = (void *)(buf->dirent + buf->used);
         unsigned int reclen;
 
@@ -1842,7 +1842,7 @@ static int nfsd_buffered_filldir(void *__buf, const char *name, int namlen,
         return 0;
 }
 
-static __be32 nfsd_buffered_readdir(struct file *file, filldir_t func,
+static __be32 nfsd_buffered_readdir(struct file *file, nfsd_filldir_t func,
                                     struct readdir_cd *cdp, loff_t *offsetp)
 {
         struct buffered_dirent *de;
@@ -1926,7 +1926,7 @@ static __be32 nfsd_buffered_readdir(struct file *file, filldir_t func,
  */
 __be32
 nfsd_readdir(struct svc_rqst *rqstp, struct svc_fh *fhp, loff_t *offsetp, 
-             struct readdir_cd *cdp, filldir_t func)
+             struct readdir_cd *cdp, nfsd_filldir_t func)
 {
         __be32          err;
         struct file     *file;
diff --git a/fs/nfsd/vfs.h b/fs/nfsd/vfs.h
index c2ff3f14e5f6..b1796d6ee538 100644
--- a/fs/nfsd/vfs.h
+++ b/fs/nfsd/vfs.h
@@ -36,7 +36,7 @@
 /*
  * Callback function for readdir
  */
-typedef int (*nfsd_dirop_t)(struct inode *, struct dentry *, int, int);
+typedef int (*nfsd_filldir_t)(void *, const char *, int, loff_t, u64, unsigned);
 
 /* nfsd/vfs.c */
 int             nfsd_racache_init(int);
@@ -95,7 +95,7 @@ __be32		nfsd_rename(struct svc_rqst *,
 __be32          nfsd_unlink(struct svc_rqst *, struct svc_fh *, int type,
                                 char *name, int len);
 __be32          nfsd_readdir(struct svc_rqst *, struct svc_fh *,
-                             loff_t *, struct readdir_cd *, filldir_t);
+                             loff_t *, struct readdir_cd *, nfsd_filldir_t);
 __be32          nfsd_statfs(struct svc_rqst *, struct svc_fh *,
                                 struct kstatfs *, int access);