mirror of https://github.com/torvalds/linux.git
nfsd: discard nfsd_file_get_local()
This interface was deprecated by commit e6f7e1487a ("nfs_localio:
simplify interface to nfsd for getting nfsd_file") and is now
unused. So let's remove it.
Signed-off-by: NeilBrown <neil@brown.name>
Reviewed-by: Mike Snitzer <snitzer@kernel.org>
Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
This commit is contained in:
parent
d9adbb6e10
commit
2ee3a75e42
|
|
@ -391,27 +391,6 @@ nfsd_file_put_local(struct nfsd_file __rcu **pnf)
|
|||
return net;
|
||||
}
|
||||
|
||||
/**
|
||||
* nfsd_file_get_local - get nfsd_file reference and reference to net
|
||||
* @nf: nfsd_file of which to put the reference
|
||||
*
|
||||
* Get reference to both the nfsd_file and nf->nf_net.
|
||||
*/
|
||||
struct nfsd_file *
|
||||
nfsd_file_get_local(struct nfsd_file *nf)
|
||||
{
|
||||
struct net *net = nf->nf_net;
|
||||
|
||||
if (nfsd_net_try_get(net)) {
|
||||
nf = nfsd_file_get(nf);
|
||||
if (!nf)
|
||||
nfsd_net_put(net);
|
||||
} else {
|
||||
nf = NULL;
|
||||
}
|
||||
return nf;
|
||||
}
|
||||
|
||||
/**
|
||||
* nfsd_file_file - get the backing file of an nfsd_file
|
||||
* @nf: nfsd_file of which to access the backing file.
|
||||
|
|
|
|||
|
|
@ -63,7 +63,6 @@ int nfsd_file_cache_start_net(struct net *net);
|
|||
void nfsd_file_cache_shutdown_net(struct net *net);
|
||||
void nfsd_file_put(struct nfsd_file *nf);
|
||||
struct net *nfsd_file_put_local(struct nfsd_file __rcu **nf);
|
||||
struct nfsd_file *nfsd_file_get_local(struct nfsd_file *nf);
|
||||
struct nfsd_file *nfsd_file_get(struct nfsd_file *nf);
|
||||
struct file *nfsd_file_file(struct nfsd_file *nf);
|
||||
void nfsd_file_close_inode_sync(struct inode *inode);
|
||||
|
|
|
|||
|
|
@ -122,7 +122,6 @@ static const struct nfsd_localio_operations nfsd_localio_ops = {
|
|||
.nfsd_net_put = nfsd_net_put,
|
||||
.nfsd_open_local_fh = nfsd_open_local_fh,
|
||||
.nfsd_file_put_local = nfsd_file_put_local,
|
||||
.nfsd_file_get_local = nfsd_file_get_local,
|
||||
.nfsd_file_file = nfsd_file_file,
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -63,7 +63,6 @@ struct nfsd_localio_operations {
|
|||
struct nfsd_file __rcu **pnf,
|
||||
const fmode_t);
|
||||
struct net *(*nfsd_file_put_local)(struct nfsd_file __rcu **);
|
||||
struct nfsd_file *(*nfsd_file_get_local)(struct nfsd_file *);
|
||||
struct file *(*nfsd_file_file)(struct nfsd_file *);
|
||||
} ____cacheline_aligned;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue