diff options
author | Christoph Hellwig <hch@lst.de> | 2014-08-14 02:44:57 -0400 |
---|---|---|
committer | Christoph Hellwig <hch@lst.de> | 2015-02-02 12:09:40 -0500 |
commit | cd61c522318f2c30ce731bfdb14e7c34203e3d7c (patch) | |
tree | 0437c9347c8b2464643eb2743a26452cb619a2e6 | |
parent | 9558f2500a2028ffc05cfd8fceaa0fe0a0a3804e (diff) |
nfsd: make lookup/alloc/unhash_stid available outside nfs4state.c
Signed-off-by: Christoph Hellwig <hch@lst.de>
-rw-r--r-- | fs/nfsd/nfs4state.c | 8 | ||||
-rw-r--r-- | fs/nfsd/state.h | 6 |
2 files changed, 10 insertions, 4 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index eb0336e526d2..75faacb03e8e 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c | |||
@@ -476,7 +476,7 @@ static void nfs4_file_put_access(struct nfs4_file *fp, u32 access) | |||
476 | __nfs4_file_put_access(fp, O_RDONLY); | 476 | __nfs4_file_put_access(fp, O_RDONLY); |
477 | } | 477 | } |
478 | 478 | ||
479 | static struct nfs4_stid *nfs4_alloc_stid(struct nfs4_client *cl, | 479 | struct nfs4_stid *nfs4_alloc_stid(struct nfs4_client *cl, |
480 | struct kmem_cache *slab) | 480 | struct kmem_cache *slab) |
481 | { | 481 | { |
482 | struct nfs4_stid *stid; | 482 | struct nfs4_stid *stid; |
@@ -680,7 +680,7 @@ static void nfs4_put_deleg_lease(struct nfs4_file *fp) | |||
680 | } | 680 | } |
681 | } | 681 | } |
682 | 682 | ||
683 | static void unhash_stid(struct nfs4_stid *s) | 683 | void nfs4_unhash_stid(struct nfs4_stid *s) |
684 | { | 684 | { |
685 | s->sc_type = 0; | 685 | s->sc_type = 0; |
686 | } | 686 | } |
@@ -988,7 +988,7 @@ static void unhash_lock_stateid(struct nfs4_ol_stateid *stp) | |||
988 | 988 | ||
989 | list_del_init(&stp->st_locks); | 989 | list_del_init(&stp->st_locks); |
990 | unhash_ol_stateid(stp); | 990 | unhash_ol_stateid(stp); |
991 | unhash_stid(&stp->st_stid); | 991 | nfs4_unhash_stid(&stp->st_stid); |
992 | } | 992 | } |
993 | 993 | ||
994 | static void release_lock_stateid(struct nfs4_ol_stateid *stp) | 994 | static void release_lock_stateid(struct nfs4_ol_stateid *stp) |
@@ -4433,7 +4433,7 @@ out_unlock: | |||
4433 | return status; | 4433 | return status; |
4434 | } | 4434 | } |
4435 | 4435 | ||
4436 | static __be32 | 4436 | __be32 |
4437 | nfsd4_lookup_stateid(struct nfsd4_compound_state *cstate, | 4437 | nfsd4_lookup_stateid(struct nfsd4_compound_state *cstate, |
4438 | stateid_t *stateid, unsigned char typemask, | 4438 | stateid_t *stateid, unsigned char typemask, |
4439 | struct nfs4_stid **s, struct nfsd_net *nn) | 4439 | struct nfs4_stid **s, struct nfsd_net *nn) |
diff --git a/fs/nfsd/state.h b/fs/nfsd/state.h index dab6553ceea1..55a3ece5fe06 100644 --- a/fs/nfsd/state.h +++ b/fs/nfsd/state.h | |||
@@ -545,6 +545,12 @@ struct nfsd_net; | |||
545 | extern __be32 nfs4_preprocess_stateid_op(struct net *net, | 545 | extern __be32 nfs4_preprocess_stateid_op(struct net *net, |
546 | struct nfsd4_compound_state *cstate, | 546 | struct nfsd4_compound_state *cstate, |
547 | stateid_t *stateid, int flags, struct file **filp); | 547 | stateid_t *stateid, int flags, struct file **filp); |
548 | __be32 nfsd4_lookup_stateid(struct nfsd4_compound_state *cstate, | ||
549 | stateid_t *stateid, unsigned char typemask, | ||
550 | struct nfs4_stid **s, struct nfsd_net *nn); | ||
551 | struct nfs4_stid *nfs4_alloc_stid(struct nfs4_client *cl, | ||
552 | struct kmem_cache *slab); | ||
553 | void nfs4_unhash_stid(struct nfs4_stid *s); | ||
548 | void nfs4_put_stid(struct nfs4_stid *s); | 554 | void nfs4_put_stid(struct nfs4_stid *s); |
549 | void nfs4_remove_reclaim_record(struct nfs4_client_reclaim *, struct nfsd_net *); | 555 | void nfs4_remove_reclaim_record(struct nfs4_client_reclaim *, struct nfsd_net *); |
550 | extern void nfs4_release_reclaim(struct nfsd_net *); | 556 | extern void nfs4_release_reclaim(struct nfsd_net *); |