shithub: lwext4

Info  •  Files  •  Log  •  Branches

ext4_trans: fix return value of ext4_trans_try_revoke_block

Function ext4_trans_try_revoke_block has been always return EOK,
even if jbd_trans_try_revoke_block fail.

--- a/lwext4/ext4_trans.c

+++ b/lwext4/ext4_trans.c

@@ -78,7 +78,8 @@

 	if (r != EOK)

 		return r;

-	if((r = ext4_trans_get_write_access(bdev->fs, b)) != EOK)

+	r = ext4_trans_get_write_access(bdev->fs, b);

+	if (r != EOK)

 		ext4_block_set(bdev, b);

 	return r;

@@ -92,7 +93,8 @@

 	if (r != EOK)

 		return r;

-	if((r = ext4_trans_get_write_access(bdev->fs, b)) != EOK)

+	r = ext4_trans_get_write_access(bdev->fs, b);

+	if (r != EOK)

 		ext4_block_set(bdev, b);

 	return r;

@@ -105,7 +107,7 @@

 	struct ext4_fs *fs = bdev->fs;

 	if (fs->jbd_journal && fs->curr_trans) {

 		struct jbd_trans *trans = fs->curr_trans;

-		jbd_trans_try_revoke_block(trans, lba);

+		r = jbd_trans_try_revoke_block(trans, lba);

 	}

 	return r;

 }