Commit c135cb39 authored by Trond Myklebust's avatar Trond Myklebust Committed by Anna Schumaker
Browse files

NFS: Remove the unused return_delegation() callback 



Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent 199366f0

fs/nfs/nfs3proc.c

+0 −7
Original line number Diff line number Diff line
@@ -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,

fs/nfs/nfs4proc.c

+0 −1
Original line number Diff line number Diff line
@@ -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,

fs/nfs/proc.c

+0 −7
Original line number Diff line number Diff line
@@ -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,

include/linux/nfs_xdr.h

+0 −1
Original line number Diff line number Diff line
@@ -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 *);