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

[~andy/linux] / fs / nfs / callback_proc.c

diff --git a/fs/nfs/callback_proc.c b/fs/nfs/callback_proc.c
index a08770a7e857bf10ef5f21f9e10d1465c2c9ce88..930d10fecdaff8632dc35869c3695fc8397e8d7a 100644 (file)
--- a/fs/nfs/callback_proc.c
+++ b/fs/nfs/callback_proc.c
@@ -37,8 +37,8 @@ __be32 nfs4_callback_getattr(struct cb_getattrargs *args, struct cb_getattrres *
        if (inode == NULL)
                goto out_putclient;
        nfsi = NFS_I(inode);
-       down_read(&nfsi->rwsem);
-       delegation = nfsi->delegation;
+       rcu_read_lock();
+       delegation = rcu_dereference(nfsi->delegation);
        if (delegation == NULL || (delegation->type & FMODE_WRITE) == 0)
                goto out_iput;
        res->size = i_size_read(inode);
@@ -53,7 +53,7 @@ __be32 nfs4_callback_getattr(struct cb_getattrargs *args, struct cb_getattrres *
                args->bitmap[1];
        res->status = 0;
 out_iput:
-       up_read(&nfsi->rwsem);
+       rcu_read_unlock();
        iput(inode);
 out_putclient:
        nfs_put_client(clp);
@@ -62,16 +62,6 @@ out:
        return res->status;
 }
 
-static int (*nfs_validate_delegation_stateid(struct nfs_client *clp))(struct nfs_delegation *, const nfs4_stateid *)
-{
-#if defined(CONFIG_NFS_V4_1)
-       if (clp->cl_minorversion > 0)
-               return nfs41_validate_delegation_stateid;
-#endif
-       return nfs4_validate_delegation_stateid;
-}
-
-
 __be32 nfs4_callback_recall(struct cb_recallargs *args, void *dummy)
 {
        struct nfs_client *clp;
@@ -92,8 +82,7 @@ __be32 nfs4_callback_recall(struct cb_recallargs *args, void *dummy)
                inode = nfs_delegation_find_inode(clp, &args->fh);
                if (inode != NULL) {
                        /* Set up a helper thread to actually return the delegation */
-                       switch (nfs_async_inode_return_delegation(inode, &args->stateid,
-                                                                 nfs_validate_delegation_stateid(clp))) {
+                       switch (nfs_async_inode_return_delegation(inode, &args->stateid)) {
                                case 0:
                                        res = 0;
                                        break;