From: "Fabio M. De Francesco" <fmdefrancesco@gmail.com>
To: Christoph Hellwig <hch@infradead.org>,
linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org,
Al Viro <viro@zeniv.linux.org.uk>,
Ira Weiny <ira.weiny@intel.com>
Cc: "Fabio M. De Francesco" <fmdefrancesco@gmail.com>
Subject: [PATCH v3 3/4] fs/sysv: Use dir_put_page() in sysv_rename()
Date: Thu, 19 Jan 2023 16:32:31 +0100 [thread overview]
Message-ID: <20230119153232.29750-4-fmdefrancesco@gmail.com> (raw)
In-Reply-To: <20230119153232.29750-1-fmdefrancesco@gmail.com>
Use the dir_put_page() helper in sysv_rename() instead of open-coding two
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/sysv/dir.c | 2 +-
fs/sysv/namei.c | 9 +++------
fs/sysv/sysv.h | 1 +
3 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/fs/sysv/dir.c b/fs/sysv/dir.c
index 8d14c6c02476..2e35b95d3efb 100644
--- a/fs/sysv/dir.c
+++ b/fs/sysv/dir.c
@@ -28,7 +28,7 @@ const struct file_operations sysv_dir_operations = {
.fsync = generic_file_fsync,
};
-static inline void dir_put_page(struct page *page)
+inline void dir_put_page(struct page *page)
{
kunmap(page);
put_page(page);
diff --git a/fs/sysv/namei.c b/fs/sysv/namei.c
index b2e6abc06a2d..981c1d76f342 100644
--- a/fs/sysv/namei.c
+++ b/fs/sysv/namei.c
@@ -250,13 +250,10 @@ static int sysv_rename(struct user_namespace *mnt_userns, struct inode *old_dir,
return 0;
out_dir:
- if (dir_de) {
- kunmap(dir_page);
- put_page(dir_page);
- }
+ if (dir_de)
+ dir_put_page(dir_page);
out_old:
- kunmap(old_page);
- put_page(old_page);
+ dir_put_page(old_page);
out:
return err;
}
diff --git a/fs/sysv/sysv.h b/fs/sysv/sysv.h
index 99ddf033da4f..b250ac1dd348 100644
--- a/fs/sysv/sysv.h
+++ b/fs/sysv/sysv.h
@@ -148,6 +148,7 @@ extern void sysv_destroy_icache(void);
/* dir.c */
+extern void dir_put_page(struct page *page);
extern struct sysv_dir_entry *sysv_find_entry(struct dentry *, struct page **);
extern int sysv_add_link(struct dentry *, struct inode *);
extern int sysv_delete_entry(struct sysv_dir_entry *, struct page *);
--
2.39.0
next prev parent reply other threads:[~2023-01-19 15:33 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-19 15:32 [PATCH v3 0/4] fs/sysv: Replace kmap() with kmap_local_page() Fabio M. De Francesco
2023-01-19 15:32 ` [PATCH v3 1/4] fs/sysv: Use the offset_in_page() helper Fabio M. De Francesco
2023-01-19 15:32 ` [PATCH v3 2/4] fs/sysv: Change the signature of dir_get_page() Fabio M. De Francesco
2023-01-19 15:32 ` Fabio M. De Francesco [this message]
2023-01-19 15:32 ` [PATCH v3 4/4] fs/sysv: Replace kmap() with kmap_local_page() Fabio M. De Francesco
2023-01-20 0:54 ` Al Viro
2023-01-20 4:21 ` Al Viro
2023-01-20 4:28 ` Matthew Wilcox
2023-01-20 4:45 ` Al Viro
2023-01-20 4:54 ` Matthew Wilcox
2023-01-20 5:07 ` Al Viro
2023-01-20 5:56 ` Al Viro
2023-01-20 7:17 ` Helge Deller
2023-01-21 8:05 ` Ira Weiny
2023-01-21 10:57 ` Helge Deller
2023-01-21 19:26 ` Al Viro
2023-01-23 17:14 ` Fabio M. De Francesco
2023-01-24 20:16 ` Ira Weiny
2023-01-23 17:03 ` 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=20230119153232.29750-4-fmdefrancesco@gmail.com \
--to=fmdefrancesco@gmail.com \
--cc=hch@infradead.org \
--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;
as well as URLs for NNTP newsgroup(s).