From: NeilBrown <neilb@suse.com>
To: Al Viro <viro@ZenIV.linux.org.uk>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
linux-fsdevel@vger.kernel.org, linux-nfs@vger.kernel.org,
Amir Goldstein <amir73il@gmail.com>,
lkml <linux-kernel@vger.kernel.org>,
Lennart Poettering <lennart@poettering.net>
Subject: Re: [PATCH 1/4] fs/notify: fdinfo can report unsupported file handles.
Date: Tue, 12 Dec 2017 09:12:32 +1100 [thread overview]
Message-ID: <87374gq5gv.fsf@notabene.neil.brown.name> (raw)
In-Reply-To: <20171211062946.GX21978@ZenIV.linux.org.uk>
[-- Attachment #1: Type: text/plain, Size: 2803 bytes --]
On Mon, Dec 11 2017, Al Viro wrote:
> On Mon, Dec 11, 2017 at 05:04:05PM +1100, NeilBrown wrote:
>> @@ -385,7 +385,9 @@ int exportfs_encode_inode_fh(struct inode *inode, struct fid *fid,
>> {
>> const struct export_operations *nop = inode->i_sb->s_export_op;
>>
>> - if (nop && nop->encode_fh)
>> + if (nop)
>> + return FILEID_INVALID;
>> + if (nop->encode_fh)
>> return nop->encode_fh(inode, fid->raw, max_len, parent);
>
> This might as well have been
>
> if (nop)
> return FILEID_INVALID;
> BUG();
>
> Have you ever tested that?
I have now - except for testing against Amazon EFS.
Only problem is the one you found - thanks.
NeilBrown
-----------8<------------>8----------------
From: NeilBrown <neilb@suse.com>
Date: Mon, 11 Dec 2017 16:41:01 +1100
Subject: [PATCH] fs/notify: fdinfo can report unsupported file handles.
If a filesystem does not set sb->s_export_op, then it
does not support filehandles and export_fs_encode_fh()
and exportfs_encode_inode_fh() should not be called.
They will use export_encode_fh() is which is a default
that uses inode number generation number, but in general
they may not be stable.
So change exportfs_encode_inode_fh() to return FILEID_INVALID
if called on an unsupported Filesystem. Currently only
notify/fdinfo can do that.
Also remove the WARNing from fdinfo when exportfs_encode_inode_fh()
returns FILEID_INVALID, as that is no an erroneous condition.
Signed-off-by: NeilBrown <neilb@suse.com>
---
fs/exportfs/expfs.c | 4 +++-
fs/notify/fdinfo.c | 4 +---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/fs/exportfs/expfs.c b/fs/exportfs/expfs.c
index 329a5d103846..2fff333b750c 100644
--- a/fs/exportfs/expfs.c
+++ b/fs/exportfs/expfs.c
@@ -385,7 +385,9 @@ int exportfs_encode_inode_fh(struct inode *inode, struct fid *fid,
{
const struct export_operations *nop = inode->i_sb->s_export_op;
- if (nop && nop->encode_fh)
+ if (!nop)
+ return FILEID_INVALID;
+ if (nop->encode_fh)
return nop->encode_fh(inode, fid->raw, max_len, parent);
return export_encode_fh(inode, fid, max_len, parent);
diff --git a/fs/notify/fdinfo.c b/fs/notify/fdinfo.c
index d478629c728b..d1135ed61229 100644
--- a/fs/notify/fdinfo.c
+++ b/fs/notify/fdinfo.c
@@ -50,10 +50,8 @@ static void show_mark_fhandle(struct seq_file *m, struct inode *inode)
size = f.handle.handle_bytes >> 2;
ret = exportfs_encode_inode_fh(inode, (struct fid *)f.handle.f_handle, &size, 0);
- if ((ret == FILEID_INVALID) || (ret < 0)) {
- WARN_ONCE(1, "Can't encode file handler for inotify: %d\n", ret);
+ if ((ret == FILEID_INVALID) || (ret < 0))
return;
- }
f.handle.handle_type = ret;
f.handle.handle_bytes = size * sizeof(u32);
--
2.14.0.rc0.dirty
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
next prev parent reply other threads:[~2017-12-11 22:12 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-11 6:04 [PATCH 0/4] VFS: fix assorted issues with name_to_handle conversions NeilBrown
2017-12-11 6:04 ` [PATCH 3/4] NFS: allow name_to_handle_at() to work for Amazon EFS NeilBrown
2017-12-11 6:04 ` [PATCH 2/4] fs/notify: don't put file handle buffer on stack NeilBrown
2017-12-11 6:47 ` Amir Goldstein
2017-12-11 6:04 ` [PATCH 1/4] fs/notify: fdinfo can report unsupported file handles NeilBrown
2017-12-11 6:29 ` Al Viro
2017-12-11 22:12 ` NeilBrown [this message]
2017-12-11 6:41 ` Amir Goldstein
2017-12-11 7:05 ` Amir Goldstein
2017-12-11 13:46 ` Pavel Emelyanov
2017-12-11 14:08 ` Amir Goldstein
2017-12-11 15:21 ` Pavel Emelyanov
2017-12-11 21:52 ` NeilBrown
2017-12-12 6:39 ` Amir Goldstein
2017-12-13 2:20 ` NeilBrown
2017-12-11 6:04 ` [PATCH 4/4] fhandle: Improve error responses in name_to_handle_at() NeilBrown
2017-12-11 16:08 ` 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=87374gq5gv.fsf@notabene.neil.brown.name \
--to=neilb@suse.com \
--cc=amir73il@gmail.com \
--cc=lennart@poettering.net \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
--cc=viro@ZenIV.linux.org.uk \
/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).