The patch titled
Subject: shmem: refactor shmem_symlink()
has been added to the -mm mm-unstable branch. Its filename is
shmem-refactor-shmem_symlink.patch
This patch will shortly appear at
https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/shmem-refactor-shmem_symlink.patch
This patch will later appear in the mm-unstable branch at
git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next via the mm-everything
branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
and is updated there every 2-3 working days
------------------------------------------------------
From: Chuck Lever <chuck.lever@xxxxxxxxxx>
Subject: shmem: refactor shmem_symlink()
Date: Fri, 30 Jun 2023 13:48:56 -0400
De-duplicate the error handling paths. No change in behavior is
expected.
Link: https://lkml.kernel.org/r/168814733654.530310.9958360833543413152.stgit@xxxxxxxxxxxxxxxxxxxxx
Signed-off-by: Chuck Lever <chuck.lever@xxxxxxxxxx>
Suggested-by: Jeff Layton <jlayton@xxxxxxxxxx>
Reviewed-by: Christoph Hellwig <hch@xxxxxx>
Cc: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Cc: Christian Brauner <brauner@xxxxxxxxxx>
Cc: Hugh Dickins <hughd@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/shmem.c | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
--- a/mm/shmem.c~shmem-refactor-shmem_symlink
+++ a/mm/shmem.c
@@ -3310,26 +3310,22 @@ static int shmem_symlink(struct mnt_idma
error = security_inode_init_security(inode, dir, &dentry->d_name,
shmem_initxattrs, NULL);
- if (error && error != -EOPNOTSUPP) {
- iput(inode);
- return error;
- }
+ if (error && error != -EOPNOTSUPP)
+ goto out_iput;
inode->i_size = len-1;
if (len <= SHORT_SYMLINK_LEN) {
inode->i_link = kmemdup(symname, len, GFP_KERNEL);
if (!inode->i_link) {
- iput(inode);
- return -ENOMEM;
+ error = -ENOMEM;
+ goto out_iput;
}
inode->i_op = &shmem_short_symlink_operations;
} else {
inode_nohighmem(inode);
error = shmem_get_folio(inode, 0, &folio, SGP_WRITE);
- if (error) {
- iput(inode);
- return error;
- }
+ if (error)
+ goto out_iput;
inode->i_mapping->a_ops = &shmem_aops;
inode->i_op = &shmem_symlink_inode_operations;
memcpy(folio_address(folio), symname, len);
@@ -3344,6 +3340,9 @@ static int shmem_symlink(struct mnt_idma
d_instantiate(dentry, inode);
dget(dentry);
return 0;
+out_iput:
+ iput(inode);
+ return error;
}
static void shmem_put_link(void *arg)
_
Patches currently in -mm which might be from chuck.lever@xxxxxxxxxx are
libfs-add-directory-operations-for-stable-offsets.patch
shmem-refactor-shmem_symlink.patch
shmem-stable-directory-offsets.patch
