Merge tag 'nfs-for-3.5-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

Pull NFS client updates from Trond Myklebust:
 "New features include:
   - Rewrite the O_DIRECT code so that it can share the same coalescing
     and pNFS functionality as the page cache code.
   - Allow the server to provide hints as to when we should use pNFS,
     and when it is more efficient to read and write through the
     metadata server.
   - NFS cache consistency updates:
     * Use the ctime to emulate a change attribute for NFSv2/v3 so that
       all NFS versions can share the same cache management code.
     * New cache management code will only look at the change attribute
       and size attribute when deciding whether or not our cached data
       is still valid or not.
     * Don't request NFSv4 post-op attributes on writes in cases such as
       O_DIRECT, where we don't care about data cache consistency, or
       when we have a write delegation, and know that our cache is still
       consistent.
     * Don't request NFSv4 post-op attributes on operations such as
       COMMIT, where there are no expected metadata updates.
     * Don't request NFSv4 directory post-op attributes in cases where
       the operations themselves already return change attribute
       updates: i.e. operations such as OPEN, CREATE, REMOVE, LINK and
       RENAME.
   - Speed up 'ls' and friends by using READDIR rather than READDIRPLUS
     if we detect no attempts to lookup filenames.
   - Improve the code sharing between NFSv2/v3 and v4 mounts
   - NFSv4.1 state management efficiency improvements
   - More patches in preparation for NFSv4/v4.1 migration functionality."

Fix trivial conflict in fs/nfs/nfs4proc.c that was due to the dcache
qstr name initialization changes (that made the length/hash a 64-bit
union)

* tag 'nfs-for-3.5-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs: (146 commits)
  NFSv4: Add debugging printks to state manager
  NFSv4: Map NFS4ERR_SHARE_DENIED into an EACCES error instead of EIO
  NFSv4: update_changeattr does not need to set NFS_INO_REVAL_PAGECACHE
  NFSv4.1: nfs4_reset_session should use nfs4_handle_reclaim_lease_error
  NFSv4.1: Handle other occurrences of NFS4ERR_CONN_NOT_BOUND_TO_SESSION
  NFSv4.1: Handle NFS4ERR_CONN_NOT_BOUND_TO_SESSION in the state manager
  NFSv4.1: Handle errors in nfs4_bind_conn_to_session
  NFSv4.1: nfs4_bind_conn_to_session should drain the session
  NFSv4.1: Don't clobber the seqid if exchange_id returns a confirmed clientid
  NFSv4.1: Add DESTROY_CLIENTID
  NFSv4.1: Ensure we use the correct credentials for bind_conn_to_session
  NFSv4.1: Ensure we use the correct credentials for session create/destroy
  NFSv4.1: Move NFSPROC4_CLNT_BIND_CONN_TO_SESSION to the end of the operations
  NFSv4.1: Handle NFS4ERR_SEQ_MISORDERED when confirming the lease
  NFSv4: When purging the lease, we must clear NFS4CLNT_LEASE_CONFIRM
  NFSv4: Clean up the error handling for nfs4_reclaim_lease
  NFSv4.1: Exchange ID must use GFP_NOFS allocation mode
  nfs41: Use BIND_CONN_TO_SESSION for CB_PATH_DOWN*
  nfs4.1: add BIND_CONN_TO_SESSION operation
  NFSv4.1 test the mdsthreshold hint parameters
  ...

1 files changed, 1 insertions, 84 deletions

diff --git a/fs/nfs/getroot.c b/fs/nfs/getroot.c
index 4ca6f5c8038e..8abfb19bd3aa 100644
--- a/fs/nfs/getroot.c
+++ b/fs/nfs/getroot.c
@@ -150,7 +150,7 @@ int nfs4_get_rootfh(struct nfs_server *server, struct nfs_fh *mntfh)
                 goto out;
 
         /* Start by getting the root filehandle from the server */
-        ret = server->nfs_client->rpc_ops->getroot(server, mntfh, &fsinfo);
+        ret = nfs4_proc_get_rootfh(server, mntfh, &fsinfo);
         if (ret < 0) {
                 dprintk("nfs4_get_rootfh: getroot error = %d\n", -ret);
                 goto out;
@@ -178,87 +178,4 @@ out:
         return ret;
 }
 
-/*
- * get an NFS4 root dentry from the root filehandle
- */
-struct dentry *nfs4_get_root(struct super_block *sb, struct nfs_fh *mntfh,
-                             const char *devname)
-{
-        struct nfs_server *server = NFS_SB(sb);
-        struct nfs_fattr *fattr = NULL;
-        struct dentry *ret;
-        struct inode *inode;
-        void *name = kstrdup(devname, GFP_KERNEL);
-        int error;
-
-        dprintk("--> nfs4_get_root()\n");
-
-        if (!name)
-                return ERR_PTR(-ENOMEM);
-
-        /* get the info about the server and filesystem */
-        error = nfs4_server_capabilities(server, mntfh);
-        if (error < 0) {
-                dprintk("nfs_get_root: getcaps error = %d\n",
-                        -error);
-                kfree(name);
-                return ERR_PTR(error);
-        }
-
-        fattr = nfs_alloc_fattr();
-        if (fattr == NULL) {
-                kfree(name);
-                return ERR_PTR(-ENOMEM);
-        }
-
-        /* get the actual root for this mount */
-        error = server->nfs_client->rpc_ops->getattr(server, mntfh, fattr);
-        if (error < 0) {
-                dprintk("nfs_get_root: getattr error = %d\n", -error);
-                ret = ERR_PTR(error);
-                goto out;
-        }
-
-        if (fattr->valid & NFS_ATTR_FATTR_FSID &&
-            !nfs_fsid_equal(&server->fsid, &fattr->fsid))
-                memcpy(&server->fsid, &fattr->fsid, sizeof(server->fsid));
-
-        inode = nfs_fhget(sb, mntfh, fattr);
-        if (IS_ERR(inode)) {
-                dprintk("nfs_get_root: get root inode failed\n");
-                ret = ERR_CAST(inode);
-                goto out;
-        }
-
-        error = nfs_superblock_set_dummy_root(sb, inode);
-        if (error != 0) {
-                ret = ERR_PTR(error);
-                goto out;
-        }
-
-        /* root dentries normally start off anonymous and get spliced in later
-         * if the dentry tree reaches them; however if the dentry already
-         * exists, we'll pick it up at this point and use it as the root
-         */
-        ret = d_obtain_alias(inode);
-        if (IS_ERR(ret)) {
-                dprintk("nfs_get_root: get root dentry failed\n");
-                goto out;
-        }
-
-        security_d_instantiate(ret, inode);
-        spin_lock(&ret->d_lock);
-        if (IS_ROOT(ret) && !(ret->d_flags & DCACHE_NFSFS_RENAMED)) {
-                ret->d_fsdata = name;
-                name = NULL;
-        }
-        spin_unlock(&ret->d_lock);
-out:
-        if (name)
-                kfree(name);
-        nfs_free_fattr(fattr);
-        dprintk("<-- nfs4_get_root()\n");
-        return ret;
-}
-
 #endif /* CONFIG_NFS_V4 */