diff options
| author | Christoph Hellwig <hch@lst.de> | 2023-01-16 09:52:05 +0100 |
|---|---|---|
| committer | Jan Kara <jack@suse.cz> | 2023-01-16 12:19:25 +0100 |
| commit | 7a5fa171a2869e99fe38f61c60274e7b4bf3a5e0 (patch) | |
| tree | a4af997693c04d6d156a8a55425862910104af12 /fs/ext2/dir.c | |
| parent | 1fb40763a58c1f8130c0131c624060c6bbb929b8 (diff) | |
| download | lwn-7a5fa171a2869e99fe38f61c60274e7b4bf3a5e0.tar.gz lwn-7a5fa171a2869e99fe38f61c60274e7b4bf3a5e0.zip | |
ext2: propagate errors from ext2_prepare_chunk
Propagate errors from ext2_prepare_chunk to the callers and handle them
there. While touching the prototype also turn update_times into a bool
from the current int used as bool.
[JK: fixed up error recovery path in ext2_rename()]
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jan Kara <jack@suse.cz>
Message-Id: <20230116085205.2342975-1-hch@lst.de>
Diffstat (limited to 'fs/ext2/dir.c')
| -rw-r--r-- | fs/ext2/dir.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/fs/ext2/dir.c b/fs/ext2/dir.c index 0f144c5c7861..4a6955a0a116 100644 --- a/fs/ext2/dir.c +++ b/fs/ext2/dir.c @@ -461,9 +461,9 @@ static int ext2_handle_dirsync(struct inode *dir) return err; } -void ext2_set_link(struct inode *dir, struct ext2_dir_entry_2 *de, - struct page *page, void *page_addr, struct inode *inode, - int update_times) +int ext2_set_link(struct inode *dir, struct ext2_dir_entry_2 *de, + struct page *page, void *page_addr, struct inode *inode, + bool update_times) { loff_t pos = page_offset(page) + (char *) de - (char *) page_addr; @@ -472,7 +472,10 @@ void ext2_set_link(struct inode *dir, struct ext2_dir_entry_2 *de, lock_page(page); err = ext2_prepare_chunk(page, pos, len); - BUG_ON(err); + if (err) { + unlock_page(page); + return err; + } de->inode = cpu_to_le32(inode->i_ino); ext2_set_de_type(de, inode); ext2_commit_chunk(page, pos, len); @@ -480,7 +483,7 @@ void ext2_set_link(struct inode *dir, struct ext2_dir_entry_2 *de, dir->i_mtime = dir->i_ctime = current_time(dir); EXT2_I(dir)->i_flags &= ~EXT2_BTREE_FL; mark_inode_dirty(dir); - ext2_handle_dirsync(dir); + return ext2_handle_dirsync(dir); } /* |