NFS: Create a return_delegation rpc op

Delegations are a v4 feature, so push return_delegation out of the
generic client by creating a new rpc_op and renaming the old function to
be in the nfs v4 "namespace"

Signed-off-by: Bryan Schumaker <bjschuma@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

diff --git a/fs/nfs/delegation.c b/fs/nfs/delegation.c
index 36c7c647a1d0cfc6d8899eb423e39c919551bea4..81c5eec3cf3803a610efee85e37d0f2276cbe108 100644 (file)
--- a/fs/nfs/delegation.c
+++ b/fs/nfs/delegation.c
@@ -388,7 +388,7 @@ void nfs_inode_return_delegation_noreclaim(struct inode *inode)
  *
  * Returns zero on success, or a negative errno value.
  */
-int nfs_inode_return_delegation(struct inode *inode)
+int nfs4_inode_return_delegation(struct inode *inode)
 {
        struct nfs_server *server = NFS_SERVER(inode);
        struct nfs_inode *nfsi = NFS_I(inode);

diff --git a/fs/nfs/delegation.h b/fs/nfs/delegation.h
index d134fc5fda700cc6ddee6db8608d8172affd9766..1f3ccd934635dd4b3a03abc0831dcfbe7b6ab865 100644 (file)
--- a/fs/nfs/delegation.h
+++ b/fs/nfs/delegation.h
@@ -33,7 +33,7 @@ enum {
 
 int nfs_inode_set_delegation(struct inode *inode, struct rpc_cred *cred, struct nfs_openres *res);
 void nfs_inode_reclaim_delegation(struct inode *inode, struct rpc_cred *cred, struct nfs_openres *res);
-int nfs_inode_return_delegation(struct inode *inode);
+int nfs4_inode_return_delegation(struct inode *inode);
 int nfs_async_inode_return_delegation(struct inode *inode, const nfs4_stateid *stateid);
 void nfs_inode_return_delegation_noreclaim(struct inode *inode);
 
@@ -58,12 +58,6 @@ bool nfs4_copy_delegation_stateid(nfs4_stateid *dst, struct inode *inode, fmode_
 void nfs_mark_delegation_referenced(struct nfs_delegation *delegation);
 int nfs4_have_delegation(struct inode *inode, fmode_t flags);
 
-#else
-static inline int nfs_inode_return_delegation(struct inode *inode)
-{
-       nfs_wb_all(inode);
-       return 0;
-}
 #endif
 
 static inline int nfs_have_delegated_attributes(struct inode *inode)

diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index 4a3e23aea1436f9c24ef17297cb6c0e22c428510..68e451f59305569ce5a272ffda923e0ece076ecc 100644 (file)
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -1778,7 +1778,7 @@ static int nfs_safe_remove(struct dentry *dentry)
        }
 
        if (inode != NULL) {
-               nfs_inode_return_delegation(inode);
+               NFS_PROTO(inode)->return_delegation(inode);
                error = NFS_PROTO(dir)->remove(dir, &dentry->d_name);
                /* The VFS may want to delete this inode */
                if (error == 0)
@@ -1906,7 +1906,7 @@ nfs_link(struct dentry *old_dentry, struct inode *dir, struct dentry *dentry)
                old_dentry->d_parent->d_name.name, old_dentry->d_name.name,
                dentry->d_parent->d_name.name, dentry->d_name.name);
 
-       nfs_inode_return_delegation(inode);
+       NFS_PROTO(inode)->return_delegation(inode);
 
        d_drop(dentry);
        error = NFS_PROTO(dir)->link(inode, dir, &dentry->d_name);
@@ -1990,9 +1990,9 @@ static int nfs_rename(struct inode *old_dir, struct dentry *old_dentry,
                }
        }
 
-       nfs_inode_return_delegation(old_inode);
+       NFS_PROTO(old_inode)->return_delegation(old_inode);
        if (new_inode != NULL)
-               nfs_inode_return_delegation(new_inode);
+               NFS_PROTO(new_inode)->return_delegation(new_inode);
 
        error = NFS_PROTO(old_dir)->rename(old_dir, &old_dentry->d_name,
                                           new_dir, &new_dentry->d_name);

diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
index 0f0b928ef2529caa5c2d5bbb27e63e1e880005c6..28c9ebbe78a6f1398e5af97168207010fcda398b 100644 (file)
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
@@ -430,7 +430,7 @@ nfs_setattr(struct dentry *dentry, struct iattr *attr)
         * Return any delegations if we're going to change ACLs
         */
        if ((attr->ia_valid & (ATTR_MODE|ATTR_UID|ATTR_GID)) != 0)
-               nfs_inode_return_delegation(inode);
+               NFS_PROTO(inode)->return_delegation(inode);
        error = NFS_PROTO(inode)->setattr(dentry, fattr, attr);
        if (error == 0)
                nfs_refresh_inode(inode, fattr);

diff --git a/fs/nfs/nfs3proc.c b/fs/nfs/nfs3proc.c
index 08f832634ef99be7608438eed9c00fda24643a81..4749a32e54bee50062e8b891cb18e774a949c0e6 100644 (file)
--- a/fs/nfs/nfs3proc.c
+++ b/fs/nfs/nfs3proc.c
@@ -882,6 +882,12 @@ static int nfs3_have_delegation(struct inode *inode, fmode_t flags)
        return 0;
 }
 
+static int nfs3_return_delegation(struct inode *inode)
+{
+       nfs_wb_all(inode);
+       return 0;
+}
+
 const struct nfs_rpc_ops nfs_v3_clientops = {
        .version        = 3,                    /* protocol version */
        .dentry_ops     = &nfs_dentry_operations,
@@ -927,5 +933,6 @@ const struct nfs_rpc_ops nfs_v3_clientops = {
        .clear_acl_cache = nfs3_forget_cached_acls,
        .close_context  = nfs_close_context,
        .have_delegation = nfs3_have_delegation,
+       .return_delegation = nfs3_return_delegation,
        .init_client    = nfs_init_client,
 };

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 86f428bb5e072b3596f0be13319a19009a0bdc5c..035f7a0829ec0fb61331ebb0ec4e24b00de7a6c1 100644 (file)
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -295,7 +295,7 @@ static int nfs4_handle_exception(struct nfs_server *server, int errorcode, struc
                        return 0;
                case -NFS4ERR_OPENMODE:
                        if (inode && nfs4_have_delegation(inode, FMODE_READ)) {
-                               nfs_inode_return_delegation(inode);
+                               nfs4_inode_return_delegation(inode);
                                exception->retry = 1;
                                return 0;
                        }
@@ -1065,7 +1065,7 @@ static void nfs4_return_incompatible_delegation(struct inode *inode, fmode_t fmo
                return;
        }
        rcu_read_unlock();
-       nfs_inode_return_delegation(inode);
+       nfs4_inode_return_delegation(inode);
 }
 
 static struct nfs4_state *nfs4_try_open_cached(struct nfs4_opendata *opendata)
@@ -3870,7 +3870,7 @@ static int __nfs4_proc_set_acl(struct inode *inode, const void *buf, size_t bufl
        i = buf_to_pages_noslab(buf, buflen, arg.acl_pages, &arg.acl_pgbase);
        if (i < 0)
                return i;
-       nfs_inode_return_delegation(inode);
+       nfs4_inode_return_delegation(inode);
        ret = nfs4_call_sync(server->client, server, &msg, &arg.seq_args, &res.seq_res, 1);
 
        /*
@@ -6805,6 +6805,7 @@ const struct nfs_rpc_ops nfs_v4_clientops = {
        .close_context  = nfs4_close_context,
        .open_context   = nfs4_atomic_open,
        .have_delegation = nfs4_have_delegation,
+       .return_delegation = nfs4_inode_return_delegation,
        .init_client    = nfs4_init_client,
 };
 

diff --git a/fs/nfs/proc.c b/fs/nfs/proc.c
index 4aed3ddf9bbaeb6a458109f3e28499f10bae1a5d..16632930abd2fce16c9762f32e8f3aeb99e23d58 100644 (file)
--- a/fs/nfs/proc.c
+++ b/fs/nfs/proc.c
@@ -739,6 +739,12 @@ static int nfs_have_delegation(struct inode *inode, fmode_t flags)
        return 0;
 }
 
+static int nfs_return_delegation(struct inode *inode)
+{
+       nfs_wb_all(inode);
+       return 0;
+}
+
 const struct nfs_rpc_ops nfs_v2_clientops = {
        .version        = 2,                   /* protocol version */
        .dentry_ops     = &nfs_dentry_operations,
@@ -783,5 +789,6 @@ const struct nfs_rpc_ops nfs_v2_clientops = {
        .lock_check_bounds = nfs_lock_check_bounds,
        .close_context  = nfs_close_context,
        .have_delegation = nfs_have_delegation,
+       .return_delegation = nfs_return_delegation,
        .init_client    = nfs_init_client,
 };

diff --git a/fs/nfs/unlink.c b/fs/nfs/unlink.c
index 3210a03342f924e886e5c7f174c9147de54911a4..13cea637eff82288f2f5508023a592e60db3fa7a 100644 (file)
--- a/fs/nfs/unlink.c
+++ b/fs/nfs/unlink.c
@@ -501,7 +501,7 @@ nfs_sillyrename(struct inode *dir, struct dentry *dentry)
                (unsigned long long)NFS_FILEID(dentry->d_inode));
 
        /* Return delegation in anticipation of the rename */
-       nfs_inode_return_delegation(dentry->d_inode);
+       NFS_PROTO(dentry->d_inode)->return_delegation(dentry->d_inode);
 
        sdentry = NULL;
        do {

diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index 8787f77c64b36557087a7c1b3b80b6c254c2b601..62235be07fb89d1c68f81f06f24cdc23541d4209 100644 (file)
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -1423,6 +1423,7 @@ struct nfs_rpc_ops {
                                int open_flags,
                                struct iattr *iattr);
        int (*have_delegation)(struct inode *, fmode_t);
+       int (*return_delegation)(struct inode *);
        struct nfs_client *
                (*init_client) (struct nfs_client *, const struct rpc_timeout *,
                                const char *, rpc_authflavor_t);