From: "Fabio M. De Francesco" <fmdefrancesco@gmail.com>
To: Evgeniy Dushistov <dushistov@mail.ru>,
Al Viro <viro@zeniv.linux.org.uk>,
Ira Weiny <ira.weiny@intel.com>,
linux-kernel@vger.kernel.org, bpf@vger.kernel.org,
linux-fsdevel@vger.kernel.org
Cc: "Fabio M. De Francesco" <fmdefrancesco@gmail.com>
Subject: [PATCH v5 3/4] fs/ufs: Use ufs_put_page() in ufs_rename()
Date: Thu, 29 Dec 2022 23:50:59 +0100 [thread overview]
Message-ID: <20221229225100.22141-4-fmdefrancesco@gmail.com> (raw)
In-Reply-To: <20221229225100.22141-1-fmdefrancesco@gmail.com>
Use the ufs_put_page() helper in ufs_rename() instead of open-coding three
kunmap() + put_page().
Cc: Al Viro <viro@zeniv.linux.org.uk>
Suggested-by: Ira Weiny <ira.weiny@intel.com>
Signed-off-by: Fabio M. De Francesco <fmdefrancesco@gmail.com>
---
fs/ufs/dir.c | 2 +-
fs/ufs/namei.c | 9 +++------
fs/ufs/ufs.h | 1 +
3 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/fs/ufs/dir.c b/fs/ufs/dir.c
index ae3b20354a28..0bfd563ab0c2 100644
--- a/fs/ufs/dir.c
+++ b/fs/ufs/dir.c
@@ -61,7 +61,7 @@ static int ufs_commit_chunk(struct page *page, loff_t pos, unsigned len)
return err;
}
-static inline void ufs_put_page(struct page *page)
+inline void ufs_put_page(struct page *page)
{
kunmap(page);
put_page(page);
diff --git a/fs/ufs/namei.c b/fs/ufs/namei.c
index 29d5a0e0c8f0..486b0f2e8b7a 100644
--- a/fs/ufs/namei.c
+++ b/fs/ufs/namei.c
@@ -307,8 +307,7 @@ static int ufs_rename(struct user_namespace *mnt_userns, struct inode *old_dir,
if (old_dir != new_dir)
ufs_set_link(old_inode, dir_de, dir_page, new_dir, 0);
else {
- kunmap(dir_page);
- put_page(dir_page);
+ ufs_put_page(dir_page);
}
inode_dec_link_count(old_dir);
}
@@ -317,12 +316,10 @@ static int ufs_rename(struct user_namespace *mnt_userns, struct inode *old_dir,
out_dir:
if (dir_de) {
- kunmap(dir_page);
- put_page(dir_page);
+ ufs_put_page(dir_page);
}
out_old:
- kunmap(old_page);
- put_page(old_page);
+ ufs_put_page(old_page);
out:
return err;
}
diff --git a/fs/ufs/ufs.h b/fs/ufs/ufs.h
index 550f7c5a3636..f7ba8df25d03 100644
--- a/fs/ufs/ufs.h
+++ b/fs/ufs/ufs.h
@@ -98,6 +98,7 @@ extern struct ufs_cg_private_info * ufs_load_cylinder (struct super_block *, uns
extern void ufs_put_cylinder (struct super_block *, unsigned);
/* dir.c */
+extern void ufs_put_page(struct page *page);
extern const struct inode_operations ufs_dir_inode_operations;
extern int ufs_add_link (struct dentry *, struct inode *);
extern ino_t ufs_inode_by_name(struct inode *, const struct qstr *);
--
2.39.0
next prev parent reply other threads:[~2022-12-29 22:51 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-29 22:50 [PATCH v5 0/4] fs/ufs: Replace kmap() with kmap_local_page Fabio M. De Francesco
2022-12-29 22:50 ` [PATCH v5 1/4] fs/ufs: Use the offset_in_page() helper Fabio M. De Francesco
2022-12-30 0:41 ` Ira Weiny
2022-12-29 22:50 ` [PATCH v5 2/4] fs/ufs: Change the signature of ufs_get_page() Fabio M. De Francesco
2022-12-29 22:50 ` Fabio M. De Francesco [this message]
2022-12-30 0:50 ` [PATCH v5 3/4] fs/ufs: Use ufs_put_page() in ufs_rename() Ira Weiny
2022-12-29 22:51 ` [PATCH v5 4/4] fs/ufs: Replace kmap() with kmap_local_page() Fabio M. De Francesco
2022-12-30 0:50 ` Ira Weiny
2023-03-27 10:13 ` [PATCH v5 0/4] fs/ufs: Replace kmap() with kmap_local_page Fabio M. De Francesco
2023-03-27 13:23 ` Matthew Wilcox
2023-04-03 5:27 ` Fabio M. De Francesco
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=20221229225100.22141-4-fmdefrancesco@gmail.com \
--to=fmdefrancesco@gmail.com \
--cc=bpf@vger.kernel.org \
--cc=dushistov@mail.ru \
--cc=ira.weiny@intel.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.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