2024-01-03 15:01:07

by David Howells

Subject: [PATCH 3/5] 9p: Do a couple of cleanups

Do a couple of cleanups to 9p:

(1) Remove a couple of unused variables.

(2) Turn a BUG_ON() into a warning, consolidate with another warning and
make the warning message include the inode number rather than
whatever's in i_private (which will get hashed anyway).

Suggested-by: Dominique Martinet <[email protected]>
Link: https://lore.kernel.org/r/[email protected]/
Signed-off-by: David Howells <[email protected]>
cc: Eric Van Hensbergen <[email protected]>
cc: Latchesar Ionkov <[email protected]>
cc: Christian Schoenebeck <[email protected]>
cc: [email protected]
cc: [email protected]
cc: [email protected]
---
fs/9p/vfs_addr.c | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/fs/9p/vfs_addr.c b/fs/9p/vfs_addr.c
index d8fb407189a0..f7f83eec3bcc 100644
--- a/fs/9p/vfs_addr.c
+++ b/fs/9p/vfs_addr.c
@@ -28,8 +28,6 @@

static void v9fs_upload_to_server(struct netfs_io_subrequest *subreq)
{
- struct inode *inode = subreq->rreq->inode;
- struct v9fs_inode __maybe_unused *v9inode = V9FS_I(inode);
struct p9_fid *fid = subreq->rreq->netfs_priv;
int err;

@@ -98,15 +96,13 @@ static int v9fs_init_request(struct netfs_io_request *rreq, struct file *file)

if (file) {
fid = file->private_data;
- BUG_ON(!fid);
+ if (!fid)
+ goto no_fid;
p9_fid_get(fid);
} else {
fid = v9fs_fid_find_inode(rreq->inode, writing, INVALID_UID, true);
- if (!fid) {
- WARN_ONCE(1, "folio expected an open fid inode->i_private=%p\n",
- rreq->inode->i_private);
- return -EINVAL;
- }
+ if (!fid)
+ goto no_fid;
}

/* we might need to read from a fid that was opened write-only
@@ -115,6 +111,11 @@ static int v9fs_init_request(struct netfs_io_request *rreq, struct file *file)
WARN_ON(rreq->origin == NETFS_READ_FOR_WRITE && !(fid->mode & P9_ORDWR));
rreq->netfs_priv = fid;
return 0;
+
+no_fid:
+ WARN_ONCE(1, "folio expected an open fid inode->i_ino=%lx\n",
+ rreq->inode->i_ino);
+ return -EINVAL;
}

/**

2024-01-03 19:46:20

by Dominique Martinet

Subject: Re: [PATCH 3/5] 9p: Do a couple of cleanups

David Howells wrote on Wed, Jan 03, 2024 at 02:59:27PM +0000:
> Do a couple of cleanups to 9p:
>
> (1) Remove a couple of unused variables.
>
> (2) Turn a BUG_ON() into a warning, consolidate with another warning and
> make the warning message include the inode number rather than
> whatever's in i_private (which will get hashed anyway).
>
> Suggested-by: Dominique Martinet <[email protected]>

Thanks,

Acked-by: Dominique Martinet <[email protected]>

--
Dominique Martinet | Asmadeus