iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

jbd2: jbd2_journal_init_{dev,inode} return proper error return value

Browse Source 
Current jbd2_journal_init_{dev,inode} return NULL if some error
happens, make them to pass out proper error return value.

[ Fix from Yang Yingliang folded in. ]

Signed-off-by: Zhang Yi <yi.zhang@huawei.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/20230811063610.2980059-11-yi.zhang@huaweicloud.com
Link: https://lore.kernel.org/r/20230822030018.644419-1-yangyingliang@huawei.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
This commit is contained in:
Zhang Yi 2023-08-11 14:36:08 +08:00 committed by Theodore Ts'o
parent d9a4549601
commit 8e6cf5fbb7
3 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/ext4/super.c
View File

@ -5815,7 +5815,7 @@ static journal_t *ext4_get_journal(struct super_block *sb,
return NULL;
journal = jbd2_journal_init_inode(journal_inode);
if (!journal) {
if (IS_ERR(journal)) {
ext4_msg(sb, KERN_ERR, "Could not load journal inode");
iput(journal_inode);
return NULL;
@ -5894,7 +5894,7 @@ static journal_t *ext4_get_dev_journal(struct super_block *sb,
journal = jbd2_journal_init_dev(bdev, sb->s_bdev,
start, len, blocksize);
if (!journal) {
if (IS_ERR(journal)) {
ext4_msg(sb, KERN_ERR, "failed to create device journal");
goto out_bdev;
}

19
fs/jbd2/journal.c
View File

@ -1531,7 +1531,7 @@ static journal_t *journal_init_common(struct block_device *bdev,
journal = kzalloc(sizeof(*journal), GFP_KERNEL);
if (!journal)
return NULL;
return ERR_PTR(-ENOMEM);
journal->j_blocksize = blocksize;
journal->j_dev = bdev;
@ -1576,6 +1576,7 @@ static journal_t *journal_init_common(struct block_device *bdev,
* journal descriptor can store up to n blocks, we need enough
* buffers to write out full descriptor block.
*/
err = -ENOMEM;
n = journal->j_blocksize / jbd2_min_tag_size();
journal->j_wbufsize = n;
journal->j_fc_wbuf = NULL;
@ -1607,7 +1608,7 @@ err_cleanup:
jbd2_journal_destroy_revoke(journal);
journal_fail_superblock(journal);
kfree(journal);
return NULL;
return ERR_PTR(err);
}
/* jbd2_journal_init_dev and jbd2_journal_init_inode:
@ -1640,8 +1641,8 @@ journal_t *jbd2_journal_init_dev(struct block_device *bdev,
journal_t *journal;
journal = journal_init_common(bdev, fs_dev, start, len, blocksize);
if (!journal)
return NULL;
if (IS_ERR(journal))
return ERR_CAST(journal);
snprintf(journal->j_devname, sizeof(journal->j_devname),
"%pg", journal->j_dev);
@ -1667,11 +1668,9 @@ journal_t *jbd2_journal_init_inode(struct inode *inode)
blocknr = 0;
err = bmap(inode, &blocknr);
if (err || !blocknr) {
pr_err("%s: Cannot locate journal superblock\n",
__func__);
return NULL;
pr_err("%s: Cannot locate journal superblock\n", __func__);
return err ? ERR_PTR(err) : ERR_PTR(-EINVAL);
}
jbd2_debug(1, "JBD2: inode %s/%ld, size %lld, bits %d, blksize %ld\n",
@ -1681,8 +1680,8 @@ journal_t *jbd2_journal_init_inode(struct inode *inode)
journal = journal_init_common(inode->i_sb->s_bdev, inode->i_sb->s_bdev,
blocknr, inode->i_size >> inode->i_sb->s_blocksize_bits,
inode->i_sb->s_blocksize);
if (!journal)
return NULL;
if (IS_ERR(journal))
return ERR_CAST(journal);
journal->j_inode = inode;
snprintf(journal->j_devname, sizeof(journal->j_devname),

8
fs/ocfs2/journal.c
View File

@ -911,9 +911,9 @@ int ocfs2_journal_init(struct ocfs2_super *osb, int *dirty)
/* call the kernels journal init function now */
j_journal = jbd2_journal_init_inode(inode);
if (j_journal == NULL) {
if (IS_ERR(j_journal)) {
mlog(ML_ERROR, "Linux journal layer error\n");
status = -EINVAL;
status = PTR_ERR(j_journal);
goto done;
}
@ -1687,9 +1687,9 @@ static int ocfs2_replay_journal(struct ocfs2_super *osb,
}
journal = jbd2_journal_init_inode(inode);
if (journal == NULL) {
if (IS_ERR(journal)) {
mlog(ML_ERROR, "Linux journal layer error\n");
status = -EIO;
status = PTR_ERR(journal);
goto done;
}