From: "J. Bruce Fields" <bfields@fieldses.org>
To: NeilBrown <neilb@suse.de>
Cc: Chuck Lever <chuck.lever@oracle.com>,
Christoph Hellwig <hch@lst.de>,
linux-nfs@vger.kernel.org
Subject: Re: [PATCH] NFSD: drop support for ancient file-handles
Date: Thu, 26 Aug 2021 10:51:29 -0400 [thread overview]
Message-ID: <20210826145129.GA3616@fieldses.org> (raw)
In-Reply-To: <162995209561.7591.4202079352301963089@noble.neil.brown.name>
On Thu, Aug 26, 2021 at 02:28:15PM +1000, NeilBrown wrote:
>
> File-handles not in the "new" or "version 1" format have not been handed
> out for new mounts since Linux 2.4 which was released 20 years ago.
> I think it is safe to say that no such file handles are still in use,
> and that we can drop support for them.
>
> This patch also moves the nfsfh.h from the include/uapi directory into
> fs/nfsd. I can find no evidence of it being used anywhere outside the
> kernel. Certainly nfs-utils and wireshark do not use it.
>
> fh_base and fh_pad are occasionally used to refer to the whole
> filehandle. These are replaced with "fh_raw" which is hopefully more
> meaningful.
Oh boy, I will not miss those (fh_version == 1) cases in nfsfh.c.
Excellent.
Looks like it just needs the following folded in.
--b.
diff --git a/fs/nfsd/flexfilelayout.c b/fs/nfsd/flexfilelayout.c
index db7ef07ae50c..2e2f1d5e9f62 100644
--- a/fs/nfsd/flexfilelayout.c
+++ b/fs/nfsd/flexfilelayout.c
@@ -61,7 +61,7 @@ nfsd4_ff_proc_layoutget(struct inode *inode, const struct svc_fh *fhp,
goto out_error;
fl->fh.size = fhp->fh_handle.fh_size;
- memcpy(fl->fh.data, &fhp->fh_handle.fh_base, fl->fh.size);
+ memcpy(fl->fh.data, &fhp->fh_handle.fh_raw, fl->fh.size);
/* Give whole file layout segments */
seg->offset = 0;
diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
index 4872b9519a72..3f7e59ec4e32 100644
--- a/fs/nfsd/nfs4proc.c
+++ b/fs/nfsd/nfs4proc.c
@@ -1383,7 +1383,7 @@ nfsd4_setup_inter_ssc(struct svc_rqst *rqstp,
s_fh = &cstate->save_fh;
copy->c_fh.size = s_fh->fh_handle.fh_size;
- memcpy(copy->c_fh.data, &s_fh->fh_handle.fh_base, copy->c_fh.size);
+ memcpy(copy->c_fh.data, &s_fh->fh_handle.fh_raw, copy->c_fh.size);
copy->stateid.seqid = cpu_to_be32(s_stid->si_generation);
memcpy(copy->stateid.other, (void *)&s_stid->si_opaque,
sizeof(stateid_opaque_t));
next prev parent reply other threads:[~2021-08-26 14:51 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-26 4:28 [PATCH] NFSD: drop support for ancient file-handles NeilBrown
2021-08-26 6:03 ` [PATCH v2] BTRFS/NFSD: provide more unique inode number for btrfs export NeilBrown
2021-08-26 20:19 ` J. Bruce Fields
2021-08-26 22:10 ` NeilBrown
2021-08-27 14:53 ` Frank Filz
2021-08-27 22:57 ` NeilBrown
2021-08-27 23:46 ` Frank Filz
2021-08-27 23:55 ` NeilBrown
2021-08-28 2:21 ` Frank Filz
2021-08-27 18:32 ` J. Bruce Fields
2021-08-27 23:01 ` NeilBrown
2021-08-27 16:20 ` Christoph Hellwig
2021-08-27 23:05 ` NeilBrown
2021-08-28 7:09 ` Christoph Hellwig
2021-08-31 4:59 ` NeilBrown
2021-09-01 7:20 ` Christoph Hellwig
2021-09-01 15:22 ` J. Bruce Fields
2021-09-02 4:14 ` NeilBrown
2021-09-05 16:07 ` J. Bruce Fields
2021-09-06 1:29 ` NeilBrown
2021-09-11 14:12 ` Amir Goldstein
2021-09-13 0:43 ` NeilBrown
2021-09-13 10:04 ` Amir Goldstein
2021-09-13 22:59 ` NeilBrown
2021-09-14 5:45 ` Amir Goldstein
2021-09-20 22:09 ` NeilBrown
2021-09-02 7:11 ` Christoph Hellwig
2021-09-02 4:06 ` NeilBrown
2021-09-02 7:16 ` Christoph Hellwig
2021-09-02 7:53 ` Miklos Szeredi
2021-09-02 14:16 ` Frank Filz
2021-09-02 23:02 ` NeilBrown
2021-08-26 14:10 ` [PATCH] NFSD: drop support for ancient file-handles Chuck Lever III
2021-08-26 21:38 ` NeilBrown
2021-08-26 14:51 ` J. Bruce Fields [this message]
2021-08-26 21:41 ` NeilBrown
2021-08-27 15:15 ` Christoph Hellwig
2021-08-27 23:24 ` NeilBrown
2021-08-31 4:41 ` [PATCH 1/2 v2] NFSD: drop support for ancient filehandles NeilBrown
2021-08-31 4:42 ` [PATCH 2/2] NFSD: simplify struct nfsfh NeilBrown
2021-09-01 7:44 ` Christoph Hellwig
2021-09-01 7:44 ` [PATCH 1/2 v2] NFSD: drop support for ancient filehandles Christoph Hellwig
2021-09-01 14:21 ` Chuck Lever III
2021-09-02 1:14 ` [PATCH 1/3 v3] NFSD: move filehandle format declarations out of "uapi" NeilBrown
2021-09-02 1:15 ` [PATCH 2/3 v3] NFSD: drop support for ancient filehandles NeilBrown
2021-09-02 1:16 ` [PATCH 3/3 v3] NFSD: simplify struct nfsfh NeilBrown
2021-09-02 7:22 ` [PATCH 2/3 v3] NFSD: drop support for ancient filehandles Christoph Hellwig
2021-09-02 7:21 ` [PATCH 1/3 v3] NFSD: move filehandle format declarations out of "uapi" Christoph Hellwig
2021-09-23 21:21 ` Bruce Fields
2021-09-25 4:21 ` NeilBrown
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=20210826145129.GA3616@fieldses.org \
--to=bfields@fieldses.org \
--cc=chuck.lever@oracle.com \
--cc=hch@lst.de \
--cc=linux-nfs@vger.kernel.org \
--cc=neilb@suse.de \
/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).