NFS: Remove the unused return_delegation() callback

Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>

diff --git a/fs/nfs/nfs3proc.c b/fs/nfs/nfs3proc.c
index ae03307bd8cdf1d4284186611a0bc0dc073d1d19..cc04d988db7c4585eee965fb7755a89c2746fdd4 100644 (file)
--- a/fs/nfs/nfs3proc.c
+++ b/fs/nfs/nfs3proc.c
@@ -910,12 +910,6 @@ 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;
-}
-
 static const struct inode_operations nfs3_dir_inode_operations = {
        .create         = nfs_create,
        .lookup         = nfs_lookup,
@@ -992,7 +986,6 @@ const struct nfs_rpc_ops nfs_v3_clientops = {
        .clear_acl_cache = forget_all_cached_acls,
        .close_context  = nfs_close_context,
        .have_delegation = nfs3_have_delegation,
-       .return_delegation = nfs3_return_delegation,
        .alloc_client   = nfs_alloc_client,
        .init_client    = nfs_init_client,
        .free_client    = nfs_free_client,

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 173089f5bf7ee2656e6645612efcc673c655f38b..04978bfd6bebd472c14d1a7b2a5f8aa26b1579e0 100644 (file)
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -9654,7 +9654,6 @@ 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,
        .alloc_client   = nfs4_alloc_client,
        .init_client    = nfs4_init_client,
        .free_client    = nfs4_free_client,

diff --git a/fs/nfs/proc.c b/fs/nfs/proc.c
index 318b3f34a6d02a24d63026f5ebbae730e91fc6a6..4e93d63087338be524918512085c2e2f5a071cdb 100644 (file)
--- a/fs/nfs/proc.c
+++ b/fs/nfs/proc.c
@@ -673,12 +673,6 @@ 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;
-}
-
 static const struct inode_operations nfs_dir_inode_operations = {
        .create         = nfs_create,
        .lookup         = nfs_lookup,
@@ -743,7 +737,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,
        .alloc_client   = nfs_alloc_client,
        .init_client    = nfs_init_client,
        .free_client    = nfs_free_client,

diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index c4ba58b3c0f816c732642117b9bd706e0edf06cb..34d28564ecf37e59f1b3d6a8a370ee8257c3e0a2 100644 (file)
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -1635,7 +1635,6 @@ struct nfs_rpc_ops {
                                struct iattr *iattr,
                                int *);
        int (*have_delegation)(struct inode *, fmode_t);
-       int (*return_delegation)(struct inode *);
        struct nfs_client *(*alloc_client) (const struct nfs_client_initdata *);
        struct nfs_client *(*init_client) (struct nfs_client *,
                                const struct nfs_client_initdata *);