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 05/20] nfsd: move nfsd_fh_match to nfsfh.h Date: Thu, 22 Jan 2015 12:09:51 +0100 [thread overview] Message-ID: <1421925006-24231-6-git-send-email-hch@lst.de> (raw) In-Reply-To: <1421925006-24231-1-git-send-email-hch@lst.de> The pnfs code will need it too. Also remove the nfsd_ prefix to match the other filehandle helpers in that file. Signed-off-by: Christoph Hellwig <hch@lst.de> --- fs/nfsd/nfs4state.c | 12 ++---------- fs/nfsd/nfsfh.h | 9 +++++++++ 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 30ff0d4..b4f86f8 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -408,14 +408,6 @@ static unsigned int file_hashval(struct knfsd_fh *fh) return nfsd_fh_hashval(fh) & (FILE_HASH_SIZE - 1); } -static bool nfsd_fh_match(struct knfsd_fh *fh1, struct knfsd_fh *fh2) -{ - return fh1->fh_size == fh2->fh_size && - !memcmp(fh1->fh_base.fh_pad, - fh2->fh_base.fh_pad, - fh1->fh_size); -} - static struct hlist_head file_hashtbl[FILE_HASH_SIZE]; static void @@ -3300,7 +3292,7 @@ find_file_locked(struct knfsd_fh *fh, unsigned int hashval) struct nfs4_file *fp; hlist_for_each_entry_rcu(fp, &file_hashtbl[hashval], fi_hash) { - if (nfsd_fh_match(&fp->fi_fhandle, fh)) { + if (fh_match(&fp->fi_fhandle, fh)) { if (atomic_inc_not_zero(&fp->fi_ref)) return fp; } @@ -4295,7 +4287,7 @@ laundromat_main(struct work_struct *laundry) static inline __be32 nfs4_check_fh(struct svc_fh *fhp, struct nfs4_ol_stateid *stp) { - if (!nfsd_fh_match(&fhp->fh_handle, &stp->st_stid.sc_file->fi_fhandle)) + if (!fh_match(&fhp->fh_handle, &stp->st_stid.sc_file->fi_fhandle)) return nfserr_bad_stateid; return nfs_ok; } diff --git a/fs/nfsd/nfsfh.h b/fs/nfsd/nfsfh.h index 08236d7..e24d954 100644 --- a/fs/nfsd/nfsfh.h +++ b/fs/nfsd/nfsfh.h @@ -187,6 +187,15 @@ fh_init(struct svc_fh *fhp, int maxsize) return fhp; } +static inline bool fh_match(struct knfsd_fh *fh1, struct knfsd_fh *fh2) +{ + if (fh1->fh_size != fh2->fh_size) + return false; + if (memcmp(fh1->fh_base.fh_pad, fh2->fh_base.fh_pad, fh1->fh_size) != 0) + return false; + return true; +} + #ifdef CONFIG_NFSD_V3 /* * The wcc data stored in current_fh should be cleared -- 1.9.1 _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs
WARNING: multiple messages have this Message-ID (diff)
From: Christoph Hellwig <hch@lst.de> To: "J. Bruce Fields" <bfields@fieldses.org> Cc: Jeff Layton <jlayton@primarydata.com>, linux-nfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, xfs@oss.sgi.com Subject: [PATCH 05/20] nfsd: move nfsd_fh_match to nfsfh.h Date: Thu, 22 Jan 2015 12:09:51 +0100 [thread overview] Message-ID: <1421925006-24231-6-git-send-email-hch@lst.de> (raw) In-Reply-To: <1421925006-24231-1-git-send-email-hch@lst.de> The pnfs code will need it too. Also remove the nfsd_ prefix to match the other filehandle helpers in that file. Signed-off-by: Christoph Hellwig <hch@lst.de> --- fs/nfsd/nfs4state.c | 12 ++---------- fs/nfsd/nfsfh.h | 9 +++++++++ 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 30ff0d4..b4f86f8 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -408,14 +408,6 @@ static unsigned int file_hashval(struct knfsd_fh *fh) return nfsd_fh_hashval(fh) & (FILE_HASH_SIZE - 1); } -static bool nfsd_fh_match(struct knfsd_fh *fh1, struct knfsd_fh *fh2) -{ - return fh1->fh_size == fh2->fh_size && - !memcmp(fh1->fh_base.fh_pad, - fh2->fh_base.fh_pad, - fh1->fh_size); -} - static struct hlist_head file_hashtbl[FILE_HASH_SIZE]; static void @@ -3300,7 +3292,7 @@ find_file_locked(struct knfsd_fh *fh, unsigned int hashval) struct nfs4_file *fp; hlist_for_each_entry_rcu(fp, &file_hashtbl[hashval], fi_hash) { - if (nfsd_fh_match(&fp->fi_fhandle, fh)) { + if (fh_match(&fp->fi_fhandle, fh)) { if (atomic_inc_not_zero(&fp->fi_ref)) return fp; } @@ -4295,7 +4287,7 @@ laundromat_main(struct work_struct *laundry) static inline __be32 nfs4_check_fh(struct svc_fh *fhp, struct nfs4_ol_stateid *stp) { - if (!nfsd_fh_match(&fhp->fh_handle, &stp->st_stid.sc_file->fi_fhandle)) + if (!fh_match(&fhp->fh_handle, &stp->st_stid.sc_file->fi_fhandle)) return nfserr_bad_stateid; return nfs_ok; } diff --git a/fs/nfsd/nfsfh.h b/fs/nfsd/nfsfh.h index 08236d7..e24d954 100644 --- a/fs/nfsd/nfsfh.h +++ b/fs/nfsd/nfsfh.h @@ -187,6 +187,15 @@ fh_init(struct svc_fh *fhp, int maxsize) return fhp; } +static inline bool fh_match(struct knfsd_fh *fh1, struct knfsd_fh *fh2) +{ + if (fh1->fh_size != fh2->fh_size) + return false; + if (memcmp(fh1->fh_base.fh_pad, fh2->fh_base.fh_pad, fh1->fh_size) != 0) + return false; + return true; +} + #ifdef CONFIG_NFSD_V3 /* * The wcc data stored in current_fh should be cleared -- 1.9.1
next prev parent reply other threads:[~2015-01-22 11:09 UTC|newest] Thread overview: 167+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-01-22 11:09 a simple and scalable pNFS block layout server V2 Christoph Hellwig 2015-01-22 11:09 ` Christoph Hellwig 2015-01-22 11:09 ` [PATCH 04/20] nfsd: factor out a helper to decode nfstime4 values Christoph Hellwig 2015-01-22 11:09 ` Christoph Hellwig [not found] ` <1421925006-24231-5-git-send-email-hch-jcswGhMUV9g@public.gmane.org> 2015-01-22 20:15 ` J. Bruce Fields 2015-01-22 20:15 ` J. Bruce Fields 2015-01-22 20:15 ` J. Bruce Fields 2015-01-22 11:09 ` Christoph Hellwig [this message] 2015-01-22 11:09 ` [PATCH 05/20] nfsd: move nfsd_fh_match to nfsfh.h Christoph Hellwig 2015-01-22 11:09 ` [PATCH 09/20] nfsd: make find_any_file available outside nfs4state.c Christoph Hellwig 2015-01-22 11:09 ` Christoph Hellwig 2015-01-22 11:09 ` [PATCH 12/20] nfsd: update documentation for pNFS support Christoph Hellwig 2015-01-22 11:09 ` Christoph Hellwig 2015-01-22 11:09 ` [PATCH 13/20] nfsd: add trace events Christoph Hellwig 2015-01-22 11:09 ` Christoph Hellwig 2015-01-22 11:10 ` [PATCH 15/20] nfsd: pNFS block layout driver Christoph Hellwig 2015-01-22 11:10 ` Christoph Hellwig 2015-01-22 11:10 ` [PATCH 18/20] xfs: factor out a xfs_update_prealloc_flags() helper Christoph Hellwig 2015-01-22 11:10 ` Christoph Hellwig [not found] ` <1421925006-24231-19-git-send-email-hch-jcswGhMUV9g@public.gmane.org> 2015-02-01 23:06 ` Dave Chinner 2015-02-01 23:06 ` Dave Chinner 2015-02-01 23:06 ` Dave Chinner 2015-01-22 16:04 ` a simple and scalable pNFS block layout server V2 Chuck Lever 2015-01-22 16:04 ` Chuck Lever 2015-01-22 16:21 ` Christoph Hellwig 2015-01-22 16:21 ` Christoph Hellwig 2015-01-22 16:21 ` Christoph Hellwig [not found] ` <1421925006-24231-1-git-send-email-hch-jcswGhMUV9g@public.gmane.org> 2015-01-22 11:09 ` [PATCH 01/20] nfs: add LAYOUT_TYPE_MAX enum value Christoph Hellwig 2015-01-22 11:09 ` Christoph Hellwig 2015-01-22 11:09 ` Christoph Hellwig 2015-01-22 11:09 ` [PATCH 02/20] fs: track fl_owner for leases Christoph Hellwig 2015-01-22 11:09 ` Christoph Hellwig 2015-01-22 11:09 ` Christoph Hellwig 2015-01-22 11:09 ` [PATCH 03/20] fs: add FL_LAYOUT lease type Christoph Hellwig 2015-01-22 11:09 ` Christoph Hellwig 2015-01-22 11:09 ` Christoph Hellwig 2015-01-22 15:45 ` Jeff Layton 2015-01-22 15:45 ` Jeff Layton [not found] ` <1421925006-24231-4-git-send-email-hch-jcswGhMUV9g@public.gmane.org> 2015-01-22 20:14 ` J. Bruce Fields 2015-01-22 20:14 ` J. Bruce Fields 2015-01-22 20:14 ` J. Bruce Fields [not found] ` <20150122201442.GJ898-uC3wQj2KruNg9hUCZPvPmw@public.gmane.org> 2015-01-22 20:18 ` Christoph Hellwig 2015-01-22 20:18 ` Christoph Hellwig 2015-01-22 20:18 ` Christoph Hellwig 2015-01-22 11:09 ` [PATCH 06/20] nfsd: add fh_fsid_match helper Christoph Hellwig 2015-01-22 11:09 ` Christoph Hellwig 2015-01-22 11:09 ` Christoph Hellwig 2015-01-22 11:09 ` [PATCH 07/20] nfsd: make lookup/alloc/unhash_stid available outside nfs4state.c Christoph Hellwig 2015-01-22 11:09 ` Christoph Hellwig 2015-01-22 11:09 ` Christoph Hellwig 2015-01-22 11:09 ` [PATCH 08/20] nfsd: make find/get/put file " Christoph Hellwig 2015-01-22 11:09 ` Christoph Hellwig 2015-01-22 11:09 ` Christoph Hellwig 2015-01-22 11:09 ` [PATCH 10/20] nfsd: implement pNFS operations Christoph Hellwig 2015-01-22 11:09 ` Christoph Hellwig 2015-01-22 11:09 ` Christoph Hellwig [not found] ` <1421925006-24231-11-git-send-email-hch-jcswGhMUV9g@public.gmane.org> 2015-01-29 20:33 ` J. Bruce Fields 2015-01-29 20:33 ` J. Bruce Fields 2015-01-29 20:33 ` J. Bruce Fields [not found] ` <20150129203346.GA11064-uC3wQj2KruNg9hUCZPvPmw@public.gmane.org> 2015-02-02 12:43 ` Christoph Hellwig 2015-02-02 12:43 ` Christoph Hellwig 2015-02-02 12:43 ` Christoph Hellwig 2015-02-02 14:28 ` J. Bruce Fields 2015-02-02 14:28 ` J. Bruce Fields [not found] ` <20150202142832.GC22301-uC3wQj2KruNg9hUCZPvPmw@public.gmane.org> 2015-02-02 14:56 ` Christoph Hellwig 2015-02-02 14:56 ` Christoph Hellwig 2015-02-02 14:56 ` Christoph Hellwig [not found] ` <20150202145619.GA18387-jcswGhMUV9g@public.gmane.org> 2015-02-02 15:00 ` J. Bruce Fields 2015-02-02 15:00 ` J. Bruce Fields 2015-02-02 15:00 ` J. Bruce Fields [not found] ` <20150202150032.GD22301-uC3wQj2KruNg9hUCZPvPmw@public.gmane.org> 2015-02-02 18:56 ` Christoph Hellwig 2015-02-02 18:56 ` Christoph Hellwig 2015-02-02 18:56 ` Christoph Hellwig [not found] ` <20150202185638.GB23319-jcswGhMUV9g@public.gmane.org> 2015-02-03 16:08 ` J. Bruce Fields 2015-02-03 16:08 ` J. Bruce Fields 2015-02-03 16:08 ` J. Bruce Fields 2015-01-22 11:09 ` [PATCH 11/20] nfsd: implement pNFS layout recalls Christoph Hellwig 2015-01-22 11:09 ` Christoph Hellwig 2015-01-22 11:09 ` Christoph Hellwig 2015-01-22 11:10 ` [PATCH 14/20] exportfs: add methods for block layout exports Christoph Hellwig 2015-01-22 11:10 ` Christoph Hellwig 2015-01-22 11:10 ` Christoph Hellwig 2015-01-22 11:10 ` [PATCH 16/20] xfs: pass a 64-bit count argument to xfs_iomap_write_unwritten Christoph Hellwig 2015-01-22 11:10 ` Christoph Hellwig 2015-01-22 11:10 ` Christoph Hellwig 2015-01-29 20:52 ` J. Bruce Fields 2015-01-29 20:52 ` J. Bruce Fields 2015-02-02 7:30 ` Christoph Hellwig 2015-02-02 7:30 ` Christoph Hellwig 2015-02-02 19:24 ` Dave Chinner 2015-02-02 19:24 ` Dave Chinner 2015-02-02 19:43 ` Dave Chinner 2015-02-02 19:43 ` Dave Chinner 2015-02-02 19:43 ` Dave Chinner 2015-02-02 19:48 ` J. Bruce Fields 2015-02-02 19:48 ` J. Bruce Fields 2015-02-02 19:48 ` J. Bruce Fields 2015-02-03 18:35 ` Christoph Hellwig 2015-02-03 18:35 ` Christoph Hellwig [not found] ` <20150203183533.GA16929-jcswGhMUV9g@public.gmane.org> 2015-02-11 22:35 ` J. Bruce Fields 2015-02-11 22:35 ` J. Bruce Fields 2015-02-11 22:35 ` J. Bruce Fields 2015-02-11 22:54 ` J. Bruce Fields 2015-02-11 22:54 ` J. Bruce Fields 2015-02-04 7:57 ` Christoph Hellwig 2015-02-04 7:57 ` Christoph Hellwig 2015-02-04 7:57 ` Christoph Hellwig [not found] ` <20150204075756.GA763-jcswGhMUV9g@public.gmane.org> 2015-02-04 20:02 ` Dave Chinner 2015-02-04 20:02 ` Dave Chinner 2015-02-04 20:02 ` Dave Chinner 2015-01-22 11:10 ` [PATCH 17/20] xfs: update the superblock using a synchronous transaction in growfs Christoph Hellwig 2015-01-22 11:10 ` Christoph Hellwig 2015-01-22 11:10 ` Christoph Hellwig 2015-01-22 11:10 ` [PATCH 19/20] xfs: implement pNFS export operations Christoph Hellwig 2015-01-22 11:10 ` Christoph Hellwig 2015-01-22 11:10 ` Christoph Hellwig [not found] ` <1421925006-24231-20-git-send-email-hch-jcswGhMUV9g@public.gmane.org> 2015-02-05 0:47 ` Dave Chinner 2015-02-05 0:47 ` Dave Chinner 2015-02-05 0:47 ` Dave Chinner 2015-02-05 7:08 ` Christoph Hellwig 2015-02-05 7:08 ` Christoph Hellwig 2015-02-05 7:08 ` Christoph Hellwig [not found] ` <20150205070858.GA593-jcswGhMUV9g@public.gmane.org> 2015-02-05 13:57 ` Christoph Hellwig 2015-02-05 13:57 ` Christoph Hellwig 2015-02-05 13:57 ` Christoph Hellwig [not found] ` <20150205135756.GA6386-jcswGhMUV9g@public.gmane.org> 2015-02-06 22:20 ` Dave Chinner 2015-02-06 22:20 ` Dave Chinner 2015-02-06 22:20 ` Dave Chinner 2015-02-06 22:42 ` J. Bruce Fields 2015-02-06 22:42 ` J. Bruce Fields 2015-02-08 13:34 ` Christoph Hellwig 2015-02-08 13:34 ` Christoph Hellwig [not found] ` <20150208133435.GA27081-jcswGhMUV9g@public.gmane.org> 2015-02-08 14:09 ` Jeff Layton 2015-02-08 14:09 ` Jeff Layton 2015-02-08 14:09 ` Jeff Layton [not found] ` <20150208090942.51e99687-9yPaYZwiELC+kQycOl6kW4xkIHaj4LzF@public.gmane.org> 2015-02-09 20:11 ` J. Bruce Fields 2015-02-09 20:11 ` J. Bruce Fields 2015-02-09 20:11 ` J. Bruce Fields [not found] ` <20150209201154.GA27746-uC3wQj2KruNg9hUCZPvPmw@public.gmane.org> 2015-02-10 0:04 ` Dave Chinner 2015-02-10 0:04 ` Dave Chinner 2015-02-10 0:04 ` Dave Chinner 2015-02-13 1:11 ` J. Bruce Fields 2015-02-13 1:11 ` J. Bruce Fields 2015-02-13 1:11 ` J. Bruce Fields 2015-02-13 1:54 ` Dave Chinner 2015-02-13 1:54 ` Dave Chinner 2015-02-13 2:38 ` Stephen Rothwell 2015-02-13 2:38 ` Stephen Rothwell 2015-02-15 23:25 ` Dave Chinner 2015-02-15 23:25 ` Dave Chinner 2015-01-22 11:10 ` [PATCH 20/20] xfs: recall pNFS layouts on conflicting access Christoph Hellwig 2015-01-22 11:10 ` Christoph Hellwig 2015-01-22 11:10 ` Christoph Hellwig [not found] ` <1421925006-24231-21-git-send-email-hch-jcswGhMUV9g@public.gmane.org> 2015-02-05 0:51 ` Dave Chinner 2015-02-05 0:51 ` Dave Chinner 2015-02-05 0:51 ` Dave Chinner 2015-01-22 20:01 ` a simple and scalable pNFS block layout server V2 J. Bruce Fields 2015-01-22 20:01 ` J. Bruce Fields 2015-01-22 20:01 ` J. Bruce Fields 2015-01-22 20:06 ` J. Bruce Fields 2015-01-22 20:06 ` J. Bruce Fields 2015-01-22 20:06 ` J. Bruce Fields 2015-01-22 20:20 ` Christoph Hellwig 2015-01-22 20:20 ` Christoph Hellwig [not found] ` <20150122200618.GI898-uC3wQj2KruNg9hUCZPvPmw@public.gmane.org> 2015-01-22 20:20 ` Jeff Layton 2015-01-22 20:20 ` Jeff Layton 2015-01-22 20:20 ` Jeff Layton
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=1421925006-24231-6-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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.