leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nfsd: make find/get/put file available outside nfs4state.c

Browse Source 
Signed-off-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
Christoph Hellwig 2014-08-14 08:50:16 +02:00
parent cd61c52231
commit e6ba76e194
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fs/nfsd/nfs4state.c
View File

@ -272,7 +272,7 @@ static void nfsd4_free_file_rcu(struct rcu_head *rcu)
kmem_cache_free(file_slab, fp); kmem_cache_free(file_slab, fp);
} }
static inline void void
put_nfs4_file(struct nfs4_file *fi) put_nfs4_file(struct nfs4_file *fi)
{ {
might_lock(&state_lock); might_lock(&state_lock);
@ -285,12 +285,6 @@ put_nfs4_file(struct nfs4_file *fi)
} }
} }
static inline void
get_nfs4_file(struct nfs4_file *fi)
{
atomic_inc(&fi->fi_ref);
}
static struct file * static struct file *
__nfs4_get_fd(struct nfs4_file *f, int oflag) __nfs4_get_fd(struct nfs4_file *f, int oflag)
{ {
@ -3295,7 +3289,7 @@ find_file_locked(struct knfsd_fh *fh, unsigned int hashval)
return NULL; return NULL;
} }
static struct nfs4_file * struct nfs4_file *
find_file(struct knfsd_fh *fh) find_file(struct knfsd_fh *fh)
{ {
struct nfs4_file *fp; struct nfs4_file *fp;

7
fs/nfsd/state.h
View File

@ -573,6 +573,13 @@ extern struct nfs4_client_reclaim *nfs4_client_to_reclaim(const char *name,
struct nfsd_net *nn); struct nfsd_net *nn);
extern bool nfs4_has_reclaimed_state(const char *name, struct nfsd_net *nn); extern bool nfs4_has_reclaimed_state(const char *name, struct nfsd_net *nn);
struct nfs4_file *find_file(struct knfsd_fh *fh);
void put_nfs4_file(struct nfs4_file *fi);
static inline void get_nfs4_file(struct nfs4_file *fi)
{
atomic_inc(&fi->fi_ref);
}
/* grace period management */ /* grace period management */
void nfsd4_end_grace(struct nfsd_net *nn); void nfsd4_end_grace(struct nfsd_net *nn);