summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorTrond Myklebust <trond.myklebust@primarydata.com>2018-03-20 16:43:19 -0400
committerAnna Schumaker <Anna.Schumaker@Netapp.com>2018-04-10 16:06:22 -0400
commitc135cb39a907b85aef5389c191b6f02cffbadb8a (patch)
treec03d6d75c165f539a605977e2bd7a028b825158a /fs
parent199366f0173f9e01efc23ecd7d88b82ad34f42fb (diff)
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>
Diffstat (limited to 'fs')
-rw-r--r--fs/nfs/nfs3proc.c7
-rw-r--r--fs/nfs/nfs4proc.c1
-rw-r--r--fs/nfs/proc.c7
3 files changed, 0 insertions, 15 deletions
diff --git a/fs/nfs/nfs3proc.c b/fs/nfs/nfs3proc.c
index ae03307bd8cd..cc04d988db7c 100644
--- 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)
910 return 0; 910 return 0;
911} 911}
912 912
913static int nfs3_return_delegation(struct inode *inode)
914{
915 nfs_wb_all(inode);
916 return 0;
917}
918
919static const struct inode_operations nfs3_dir_inode_operations = { 913static const struct inode_operations nfs3_dir_inode_operations = {
920 .create = nfs_create, 914 .create = nfs_create,
921 .lookup = nfs_lookup, 915 .lookup = nfs_lookup,
@@ -992,7 +986,6 @@ const struct nfs_rpc_ops nfs_v3_clientops = {
992 .clear_acl_cache = forget_all_cached_acls, 986 .clear_acl_cache = forget_all_cached_acls,
993 .close_context = nfs_close_context, 987 .close_context = nfs_close_context,
994 .have_delegation = nfs3_have_delegation, 988 .have_delegation = nfs3_have_delegation,
995 .return_delegation = nfs3_return_delegation,
996 .alloc_client = nfs_alloc_client, 989 .alloc_client = nfs_alloc_client,
997 .init_client = nfs_init_client, 990 .init_client = nfs_init_client,
998 .free_client = nfs_free_client, 991 .free_client = nfs_free_client,
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 173089f5bf7e..04978bfd6beb 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -9654,7 +9654,6 @@ const struct nfs_rpc_ops nfs_v4_clientops = {
9654 .close_context = nfs4_close_context, 9654 .close_context = nfs4_close_context,
9655 .open_context = nfs4_atomic_open, 9655 .open_context = nfs4_atomic_open,
9656 .have_delegation = nfs4_have_delegation, 9656 .have_delegation = nfs4_have_delegation,
9657 .return_delegation = nfs4_inode_return_delegation,
9658 .alloc_client = nfs4_alloc_client, 9657 .alloc_client = nfs4_alloc_client,
9659 .init_client = nfs4_init_client, 9658 .init_client = nfs4_init_client,
9660 .free_client = nfs4_free_client, 9659 .free_client = nfs4_free_client,
diff --git a/fs/nfs/proc.c b/fs/nfs/proc.c
index 318b3f34a6d0..4e93d6308733 100644
--- 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)
673 return 0; 673 return 0;
674} 674}
675 675
676static int nfs_return_delegation(struct inode *inode)
677{
678 nfs_wb_all(inode);
679 return 0;
680}
681
682static const struct inode_operations nfs_dir_inode_operations = { 676static const struct inode_operations nfs_dir_inode_operations = {
683 .create = nfs_create, 677 .create = nfs_create,
684 .lookup = nfs_lookup, 678 .lookup = nfs_lookup,
@@ -743,7 +737,6 @@ const struct nfs_rpc_ops nfs_v2_clientops = {
743 .lock_check_bounds = nfs_lock_check_bounds, 737 .lock_check_bounds = nfs_lock_check_bounds,
744 .close_context = nfs_close_context, 738 .close_context = nfs_close_context,
745 .have_delegation = nfs_have_delegation, 739 .have_delegation = nfs_have_delegation,
746 .return_delegation = nfs_return_delegation,
747 .alloc_client = nfs_alloc_client, 740 .alloc_client = nfs_alloc_client,
748 .init_client = nfs_init_client, 741 .init_client = nfs_init_client,
749 .free_client = nfs_free_client, 742 .free_client = nfs_free_client,