From: Christoph Hellwig via Ocfs2-devel <ocfs2-devel@oss.oracle.com> To: Andrew Morton <akpm@linux-foundation.org>, Mark Fasheh <mark@fasheh.com>, Joel Becker <jlbec@evilplan.org>, Joseph Qi <joseph.qi@linux.alibaba.com>, Evgeniy Dushistov <dushistov@mail.ru>, "Matthew Wilcox (Oracle)" <willy@infradead.org> Cc: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, ocfs2-devel@oss.oracle.com Subject: [Ocfs2-devel] [PATCH 1/7] minix: move releasing pages into unlink and rename Date: Wed, 18 Jan 2023 18:30:21 +0100 [thread overview] Message-ID: <20230118173027.294869-2-hch@lst.de> (raw) In-Reply-To: <20230118173027.294869-1-hch@lst.de> Instead of consuming the page reference and kmap in the low-level minix_delete_entry and minix_set_link helpers, do it in the callers where that code can be shared with the error cleanup path. Signed-off-by: Christoph Hellwig <hch@lst.de> --- fs/minix/dir.c | 2 -- fs/minix/namei.c | 19 ++++++++++--------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/fs/minix/dir.c b/fs/minix/dir.c index dcfe5b25378b54..ec462330e749af 100644 --- a/fs/minix/dir.c +++ b/fs/minix/dir.c @@ -306,7 +306,6 @@ int minix_delete_entry(struct minix_dir_entry *de, struct page *page) } else { unlock_page(page); } - dir_put_page(page); inode->i_ctime = inode->i_mtime = current_time(inode); mark_inode_dirty(inode); return err; @@ -430,7 +429,6 @@ void minix_set_link(struct minix_dir_entry *de, struct page *page, } else { unlock_page(page); } - dir_put_page(page); dir->i_mtime = dir->i_ctime = current_time(dir); mark_inode_dirty(dir); } diff --git a/fs/minix/namei.c b/fs/minix/namei.c index 8afdc408ca4fd5..5fc696e032c543 100644 --- a/fs/minix/namei.c +++ b/fs/minix/namei.c @@ -150,23 +150,23 @@ static int minix_mkdir(struct user_namespace *mnt_userns, struct inode *dir, static int minix_unlink(struct inode * dir, struct dentry *dentry) { - int err = -ENOENT; struct inode * inode = d_inode(dentry); struct page * page; struct minix_dir_entry * de; + int err; de = minix_find_entry(dentry, &page); if (!de) - goto end_unlink; - + return -ENOENT; err = minix_delete_entry(de, page); - if (err) - goto end_unlink; + kunmap(page); + put_page(page); + if (err) + return err; inode->i_ctime = dir->i_ctime; inode_dec_link_count(inode); -end_unlink: - return err; + return 0; } static int minix_rmdir(struct inode * dir, struct dentry *dentry) @@ -223,7 +223,10 @@ static int minix_rename(struct user_namespace *mnt_userns, new_de = minix_find_entry(new_dentry, &new_page); if (!new_de) goto out_dir; + err = 0; minix_set_link(new_de, new_page, old_inode); + kunmap(new_page); + put_page(new_page); new_inode->i_ctime = current_time(new_inode); if (dir_de) drop_nlink(new_inode); @@ -243,8 +246,6 @@ static int minix_rename(struct user_namespace *mnt_userns, minix_set_link(dir_de, dir_page, new_dir); inode_dec_link_count(old_dir); } - return 0; - out_dir: if (dir_de) { kunmap(dir_page); -- 2.39.0 _______________________________________________ Ocfs2-devel mailing list Ocfs2-devel@oss.oracle.com https://oss.oracle.com/mailman/listinfo/ocfs2-devel
WARNING: multiple messages have this Message-ID (diff)
From: Christoph Hellwig <hch@lst.de> To: Andrew Morton <akpm@linux-foundation.org>, Mark Fasheh <mark@fasheh.com>, Joel Becker <jlbec@evilplan.org>, Joseph Qi <joseph.qi@linux.alibaba.com>, Evgeniy Dushistov <dushistov@mail.ru>, "Matthew Wilcox (Oracle)" <willy@infradead.org> Cc: ocfs2-devel@oss.oracle.com, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 1/7] minix: move releasing pages into unlink and rename Date: Wed, 18 Jan 2023 18:30:21 +0100 [thread overview] Message-ID: <20230118173027.294869-2-hch@lst.de> (raw) In-Reply-To: <20230118173027.294869-1-hch@lst.de> Instead of consuming the page reference and kmap in the low-level minix_delete_entry and minix_set_link helpers, do it in the callers where that code can be shared with the error cleanup path. Signed-off-by: Christoph Hellwig <hch@lst.de> --- fs/minix/dir.c | 2 -- fs/minix/namei.c | 19 ++++++++++--------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/fs/minix/dir.c b/fs/minix/dir.c index dcfe5b25378b54..ec462330e749af 100644 --- a/fs/minix/dir.c +++ b/fs/minix/dir.c @@ -306,7 +306,6 @@ int minix_delete_entry(struct minix_dir_entry *de, struct page *page) } else { unlock_page(page); } - dir_put_page(page); inode->i_ctime = inode->i_mtime = current_time(inode); mark_inode_dirty(inode); return err; @@ -430,7 +429,6 @@ void minix_set_link(struct minix_dir_entry *de, struct page *page, } else { unlock_page(page); } - dir_put_page(page); dir->i_mtime = dir->i_ctime = current_time(dir); mark_inode_dirty(dir); } diff --git a/fs/minix/namei.c b/fs/minix/namei.c index 8afdc408ca4fd5..5fc696e032c543 100644 --- a/fs/minix/namei.c +++ b/fs/minix/namei.c @@ -150,23 +150,23 @@ static int minix_mkdir(struct user_namespace *mnt_userns, struct inode *dir, static int minix_unlink(struct inode * dir, struct dentry *dentry) { - int err = -ENOENT; struct inode * inode = d_inode(dentry); struct page * page; struct minix_dir_entry * de; + int err; de = minix_find_entry(dentry, &page); if (!de) - goto end_unlink; - + return -ENOENT; err = minix_delete_entry(de, page); - if (err) - goto end_unlink; + kunmap(page); + put_page(page); + if (err) + return err; inode->i_ctime = dir->i_ctime; inode_dec_link_count(inode); -end_unlink: - return err; + return 0; } static int minix_rmdir(struct inode * dir, struct dentry *dentry) @@ -223,7 +223,10 @@ static int minix_rename(struct user_namespace *mnt_userns, new_de = minix_find_entry(new_dentry, &new_page); if (!new_de) goto out_dir; + err = 0; minix_set_link(new_de, new_page, old_inode); + kunmap(new_page); + put_page(new_page); new_inode->i_ctime = current_time(new_inode); if (dir_de) drop_nlink(new_inode); @@ -243,8 +246,6 @@ static int minix_rename(struct user_namespace *mnt_userns, minix_set_link(dir_de, dir_page, new_dir); inode_dec_link_count(old_dir); } - return 0; - out_dir: if (dir_de) { kunmap(dir_page); -- 2.39.0
next prev parent reply other threads:[~2023-01-18 17:31 UTC|newest] Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-01-18 17:30 [Ocfs2-devel] remove most callers of write_one_page v3 Christoph Hellwig via Ocfs2-devel 2023-01-18 17:30 ` Christoph Hellwig 2023-01-18 17:30 ` Christoph Hellwig via Ocfs2-devel [this message] 2023-01-18 17:30 ` [PATCH 1/7] minix: move releasing pages into unlink and rename Christoph Hellwig 2023-01-18 17:30 ` [Ocfs2-devel] [PATCH 2/7] minix: fix error handling in minix_delete_entry Christoph Hellwig via Ocfs2-devel 2023-01-18 17:30 ` Christoph Hellwig 2023-01-18 17:30 ` [Ocfs2-devel] [PATCH 3/7] minix: fix error handling in minix_set_link Christoph Hellwig via Ocfs2-devel 2023-01-18 17:30 ` Christoph Hellwig 2023-01-18 17:30 ` [Ocfs2-devel] [PATCH 4/7] minix: don't flush page immediately for DIRSYNC directories Christoph Hellwig via Ocfs2-devel 2023-01-18 17:30 ` Christoph Hellwig 2023-01-18 17:30 ` [Ocfs2-devel] [PATCH 5/7] sysv: " Christoph Hellwig via Ocfs2-devel 2023-01-18 17:30 ` Christoph Hellwig 2023-01-18 17:30 ` [Ocfs2-devel] [PATCH 6/7] ufs: " Christoph Hellwig via Ocfs2-devel 2023-01-18 17:30 ` Christoph Hellwig 2023-01-18 17:30 ` [Ocfs2-devel] [PATCH 7/7] ocfs2: don't use write_one_page in ocfs2_duplicate_clusters_by_page Christoph Hellwig via Ocfs2-devel 2023-01-18 17:30 ` Christoph Hellwig 2023-01-18 21:09 ` [Ocfs2-devel] remove most callers of write_one_page v3 Andrew Morton via Ocfs2-devel 2023-01-18 21:09 ` Andrew Morton 2023-01-18 21:23 ` Al Viro 2023-01-18 21:23 ` [Ocfs2-devel] " Al Viro via Ocfs2-devel 2023-01-18 21:33 ` Al Viro 2023-01-18 21:33 ` [Ocfs2-devel] " Al Viro via Ocfs2-devel 2023-01-19 5:28 ` Christoph Hellwig 2023-01-19 5:28 ` [Ocfs2-devel] " Christoph Hellwig via Ocfs2-devel
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=20230118173027.294869-2-hch@lst.de \ --to=ocfs2-devel@oss.oracle.com \ --cc=akpm@linux-foundation.org \ --cc=dushistov@mail.ru \ --cc=hch@lst.de \ --cc=jlbec@evilplan.org \ --cc=joseph.qi@linux.alibaba.com \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=mark@fasheh.com \ --cc=willy@infradead.org \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.