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 3/7] minix: fix error handling in minix_set_link
Date: Wed, 18 Jan 2023 18:30:23 +0100 [thread overview]
Message-ID: <20230118173027.294869-4-hch@lst.de> (raw)
In-Reply-To: <20230118173027.294869-1-hch@lst.de>
If minix_prepare_chunk fails, updating c/mtime and marking the
dir inode dirty is wrong, as the inode hasn't been modified. Also
propagate the error to the caller.
Note that this moves the dir_put_page call later, but that matches
other uses of this helper in the directory code.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
fs/minix/dir.c | 22 ++++++++++++----------
fs/minix/minix.h | 3 ++-
fs/minix/namei.c | 10 ++++++----
3 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/fs/minix/dir.c b/fs/minix/dir.c
index 242e179aa1fbeb..34c1cdb5dc7d47 100644
--- a/fs/minix/dir.c
+++ b/fs/minix/dir.c
@@ -410,8 +410,8 @@ int minix_empty_dir(struct inode * inode)
}
/* Releases the page */
-void minix_set_link(struct minix_dir_entry *de, struct page *page,
- struct inode *inode)
+int minix_set_link(struct minix_dir_entry *de, struct page *page,
+ struct inode *inode)
{
struct inode *dir = page->mapping->host;
struct minix_sb_info *sbi = minix_sb(dir->i_sb);
@@ -420,19 +420,21 @@ void minix_set_link(struct minix_dir_entry *de, struct page *page,
int err;
lock_page(page);
-
err = minix_prepare_chunk(page, pos, sbi->s_dirsize);
- if (err == 0) {
- if (sbi->s_version == MINIX_V3)
- ((minix3_dirent *) de)->inode = inode->i_ino;
- else
- de->inode = inode->i_ino;
- err = dir_commit_chunk(page, pos, sbi->s_dirsize);
- } else {
+ if (err) {
unlock_page(page);
+ return err;
}
+ if (sbi->s_version == MINIX_V3)
+ ((minix3_dirent *)de)->inode = inode->i_ino;
+ else
+ de->inode = inode->i_ino;
+ err = dir_commit_chunk(page, pos, sbi->s_dirsize);
+ if (err)
+ return err;
dir->i_mtime = dir->i_ctime = current_time(dir);
mark_inode_dirty(dir);
+ return 0;
}
struct minix_dir_entry * minix_dotdot (struct inode *dir, struct page **p)
diff --git a/fs/minix/minix.h b/fs/minix/minix.h
index 20217336802570..8f7a636bd1b241 100644
--- a/fs/minix/minix.h
+++ b/fs/minix/minix.h
@@ -69,7 +69,8 @@ extern int minix_add_link(struct dentry*, struct inode*);
extern int minix_delete_entry(struct minix_dir_entry*, struct page*);
extern int minix_make_empty(struct inode*, struct inode*);
extern int minix_empty_dir(struct inode*);
-extern void minix_set_link(struct minix_dir_entry*, struct page*, struct inode*);
+int minix_set_link(struct minix_dir_entry *de, struct page *page,
+ struct inode *inode);
extern struct minix_dir_entry *minix_dotdot(struct inode*, struct page**);
extern ino_t minix_inode_by_name(struct dentry*);
diff --git a/fs/minix/namei.c b/fs/minix/namei.c
index 5fc696e032c543..bfbadd85d01032 100644
--- a/fs/minix/namei.c
+++ b/fs/minix/namei.c
@@ -223,10 +223,11 @@ 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);
+ err = minix_set_link(new_de, new_page, old_inode);
kunmap(new_page);
put_page(new_page);
+ if (err)
+ goto out_dir;
new_inode->i_ctime = current_time(new_inode);
if (dir_de)
drop_nlink(new_inode);
@@ -243,8 +244,9 @@ static int minix_rename(struct user_namespace *mnt_userns,
mark_inode_dirty(old_inode);
if (dir_de) {
- minix_set_link(dir_de, dir_page, new_dir);
- inode_dec_link_count(old_dir);
+ err = minix_set_link(dir_de, dir_page, new_dir);
+ if (!err)
+ inode_dec_link_count(old_dir);
}
out_dir:
if (dir_de) {
--
2.39.0
_______________________________________________
Ocfs2-devel mailing list
Ocfs2-devel@oss.oracle.com
https://oss.oracle.com/mailman/listinfo/ocfs2-devel
next prev parent reply other threads:[~2023-01-18 17:31 UTC|newest]
Thread overview: 12+ 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 ` [Ocfs2-devel] [PATCH 1/7] minix: move releasing pages into unlink and rename Christoph Hellwig via Ocfs2-devel
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 via Ocfs2-devel [this message]
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 ` [Ocfs2-devel] [PATCH 5/7] sysv: " Christoph Hellwig via Ocfs2-devel
2023-01-18 17:30 ` [Ocfs2-devel] [PATCH 6/7] ufs: " Christoph Hellwig via Ocfs2-devel
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 21:09 ` [Ocfs2-devel] remove most callers of write_one_page v3 Andrew Morton via Ocfs2-devel
2023-01-18 21:23 ` Al Viro via Ocfs2-devel
2023-01-18 21:33 ` Al Viro via Ocfs2-devel
2023-01-19 5:28 ` 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-4-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: 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).