From: Li Xi <pkuelelixi@gmail.com>
Date: Thu, 2 Oct 2014 02:11:06 +0000 (-0400)
Subject: ext4: fix return value of ext4_do_update_inode
X-Git-Tag: firefly_0821_release~176^2~2990^2~11
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=bce92d566a57893e98ec83e4e5447f860d2889b7;p=firefly-linux-kernel-4.4.55.git

ext4: fix return value of ext4_do_update_inode

When ext4_do_update_inode() gets error from ext4_inode_blocks_set(),
error number should be returned.

Signed-off-by: Li Xi <lixi@ddn.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Jan Kara <jack@suse.cz>
---

diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 091845298f48..41c4f97c39d3 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -4204,7 +4204,8 @@ static int ext4_do_update_inode(handle_t *handle,
 	EXT4_INODE_SET_XTIME(i_atime, inode, raw_inode);
 	EXT4_EINODE_SET_XTIME(i_crtime, ei, raw_inode);
 
-	if (ext4_inode_blocks_set(handle, raw_inode, ei)) {
+	err = ext4_inode_blocks_set(handle, raw_inode, ei);
+	if (err) {
 		spin_unlock(&ei->i_raw_lock);
 		goto out_brelse;
 	}