From: Christoph Hellwig <hch@lst.de>
To: "J. Bruce Fields" <bfields@fieldses.org>
Cc: linux-fsdevel@vger.kernel.org, linux-nfs@vger.kernel.org,
Jeff Layton <jlayton@primarydata.com>,
xfs@oss.sgi.com
Subject: [PATCH 06/18] nfsd: make lookup/alloc/unhash_stid available outside nfs4state.c
Date: Tue, 6 Jan 2015 17:28:29 +0100 [thread overview]
Message-ID: <1420561721-9150-7-git-send-email-hch@lst.de> (raw)
In-Reply-To: <1420561721-9150-1-git-send-email-hch@lst.de>
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
fs/nfsd/nfs4state.c | 8 ++++----
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 aaa3f8e..e804e9b 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -486,7 +486,7 @@ static void nfs4_file_put_access(struct nfs4_file *fp, u32 access)
__nfs4_file_put_access(fp, O_RDONLY);
}
-static struct nfs4_stid *nfs4_alloc_stid(struct nfs4_client *cl,
+struct nfs4_stid *nfs4_alloc_stid(struct nfs4_client *cl,
struct kmem_cache *slab)
{
struct nfs4_stid *stid;
@@ -690,7 +690,7 @@ static void nfs4_put_deleg_lease(struct nfs4_file *fp)
}
}
-static void unhash_stid(struct nfs4_stid *s)
+void nfs4_unhash_stid(struct nfs4_stid *s)
{
s->sc_type = 0;
}
@@ -998,7 +998,7 @@ static void unhash_lock_stateid(struct nfs4_ol_stateid *stp)
list_del_init(&stp->st_locks);
unhash_ol_stateid(stp);
- unhash_stid(&stp->st_stid);
+ nfs4_unhash_stid(&stp->st_stid);
}
static void release_lock_stateid(struct nfs4_ol_stateid *stp)
@@ -4437,7 +4437,7 @@ out_unlock:
return status;
}
-static __be32
+__be32
nfsd4_lookup_stateid(struct nfsd4_compound_state *cstate,
stateid_t *stateid, unsigned char typemask,
struct nfs4_stid **s, struct nfsd_net *nn)
diff --git a/fs/nfsd/state.h b/fs/nfsd/state.h
index dab6553..55a3ece 100644
--- a/fs/nfsd/state.h
+++ b/fs/nfsd/state.h
@@ -545,6 +545,12 @@ struct nfsd_net;
extern __be32 nfs4_preprocess_stateid_op(struct net *net,
struct nfsd4_compound_state *cstate,
stateid_t *stateid, int flags, struct file **filp);
+__be32 nfsd4_lookup_stateid(struct nfsd4_compound_state *cstate,
+ stateid_t *stateid, unsigned char typemask,
+ struct nfs4_stid **s, struct nfsd_net *nn);
+struct nfs4_stid *nfs4_alloc_stid(struct nfs4_client *cl,
+ struct kmem_cache *slab);
+void nfs4_unhash_stid(struct nfs4_stid *s);
void nfs4_put_stid(struct nfs4_stid *s);
void nfs4_remove_reclaim_record(struct nfs4_client_reclaim *, struct nfsd_net *);
extern void nfs4_release_reclaim(struct nfsd_net *);
--
1.9.1
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
next prev parent reply other threads:[~2015-01-06 16:28 UTC|newest]
Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-06 16:28 a simple and scalable pNFS block layout server Christoph Hellwig
2015-01-06 16:28 ` [PATCH 01/18] nfs: add LAYOUT_TYPE_MAX enum value Christoph Hellwig
2015-01-06 16:28 ` [PATCH 02/18] fs: add FL_LAYOUT lease type Christoph Hellwig
2015-01-06 18:46 ` Jeff Layton
2015-01-07 10:30 ` Christoph Hellwig
2015-01-06 16:28 ` [PATCH 03/18] nfsd: factor out a helper to decode nfstime4 values Christoph Hellwig
[not found] ` <1420561721-9150-4-git-send-email-hch-jcswGhMUV9g@public.gmane.org>
2015-01-09 23:02 ` Tom Haynes
2015-01-11 11:42 ` Christoph Hellwig
[not found] ` <20150111114242.GA11939-jcswGhMUV9g@public.gmane.org>
2015-01-11 23:53 ` Tom Haynes
2015-01-06 16:28 ` [PATCH 04/18] nfsd: move nfsd_fh_match to nfsfh.h Christoph Hellwig
2015-01-06 16:28 ` [PATCH 05/18] nfsd: add fh_fsid_match helper Christoph Hellwig
2015-01-06 16:28 ` Christoph Hellwig [this message]
2015-01-06 16:28 ` [PATCH 07/18] nfsd: make find/get/put file available outside nfs4state.c Christoph Hellwig
2015-01-06 16:28 ` [PATCH 09/18] nfsd: implement pNFS operations Christoph Hellwig
[not found] ` <1420561721-9150-10-git-send-email-hch-jcswGhMUV9g@public.gmane.org>
2015-01-09 0:48 ` Jeff Layton
2015-01-09 10:05 ` Christoph Hellwig
2015-01-09 16:51 ` Jeff Layton
2015-01-09 17:16 ` Christoph Hellwig
2015-01-09 17:28 ` Jeff Layton
2015-01-09 17:33 ` Jeff Layton
2015-01-09 17:43 ` Trond Myklebust
2015-01-12 17:54 ` Tom Haynes
[not found] ` <1420561721-9150-1-git-send-email-hch-jcswGhMUV9g@public.gmane.org>
2015-01-06 16:28 ` [PATCH 08/18] nfsd: make find_any_file available outside nfs4state.c Christoph Hellwig
2015-01-06 16:28 ` [PATCH 10/18] nfsd: implement pNFS layout recalls Christoph Hellwig
[not found] ` <1420561721-9150-11-git-send-email-hch-jcswGhMUV9g@public.gmane.org>
2015-01-06 17:25 ` J. Bruce Fields
2015-01-06 17:42 ` Christoph Hellwig
[not found] ` <20150106174214.GB16200-jcswGhMUV9g@public.gmane.org>
2015-01-06 17:59 ` Tom Haynes
2015-01-06 16:28 ` [PATCH 11/18] nfsd: update documentation for pNFS support Christoph Hellwig
2015-01-06 16:28 ` [PATCH 12/18] nfsd: add trace events Christoph Hellwig
2015-01-06 16:28 ` [PATCH 14/18] nfsd: pNFS block layout driver Christoph Hellwig
2015-01-06 17:16 ` J. Bruce Fields
2015-01-06 17:39 ` Christoph Hellwig
2015-01-06 19:39 ` J. Bruce Fields
[not found] ` <20150106193949.GD28003-uC3wQj2KruNg9hUCZPvPmw@public.gmane.org>
2015-01-06 19:42 ` Jeff Layton
2015-01-07 10:28 ` Christoph Hellwig
2015-01-08 20:41 ` Jeff Layton
2015-01-08 20:54 ` J. Bruce Fields
[not found] ` <1420561721-9150-15-git-send-email-hch-jcswGhMUV9g@public.gmane.org>
2015-01-12 4:56 ` Tom Haynes
2015-01-12 12:43 ` Christoph Hellwig
2015-01-12 6:14 ` Tom Haynes
2015-01-12 12:46 ` Christoph Hellwig
2015-01-06 16:28 ` [PATCH 15/18] xfs: pass a 64-bit count argument to xfs_iomap_write_unwritten Christoph Hellwig
2015-01-06 16:28 ` [PATCH 16/18] xfs: do not allocate blocks when converting unwritten extents Christoph Hellwig
2015-01-06 23:21 ` Dave Chinner
2015-01-06 16:28 ` [PATCH 17/18] xfs: implement pnfs export operations Christoph Hellwig
2015-01-07 0:24 ` Dave Chinner
2015-01-07 10:40 ` Christoph Hellwig
2015-01-07 21:11 ` Dave Chinner
2015-01-08 12:43 ` Christoph Hellwig
2015-01-08 21:04 ` Dave Chinner
2015-01-09 11:41 ` Christoph Hellwig
[not found] ` <20150109114159.GA25728-jcswGhMUV9g@public.gmane.org>
2015-01-12 3:04 ` Dave Chinner
2015-01-14 10:08 ` Christoph Hellwig
2015-01-06 16:28 ` [PATCH 13/18] exportfs: add methods for block layout exports Christoph Hellwig
2015-01-06 16:28 ` [PATCH 18/18] xfs: recall pNFS layouts on conflicting access Christoph Hellwig
[not found] ` <1420561721-9150-19-git-send-email-hch-jcswGhMUV9g@public.gmane.org>
2015-01-06 23:18 ` Dave Chinner
2015-01-07 10:31 ` Christoph Hellwig
2015-01-06 17:32 ` a simple and scalable pNFS block layout server J. Bruce Fields
2015-01-06 17:56 ` Christoph Hellwig
[not found] ` <20150106175611.GA16413-jcswGhMUV9g@public.gmane.org>
2015-01-06 18:37 ` Jeff Layton
2015-01-06 18:39 ` Weston Andros Adamson
2015-01-06 19:17 ` J. Bruce Fields
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1420561721-9150-7-git-send-email-hch@lst.de \
--to=hch@lst.de \
--cc=bfields@fieldses.org \
--cc=jlayton@primarydata.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=xfs@oss.sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).