Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b9959295 authored by Tsutomu Itoh's avatar Tsutomu Itoh Committed by Chris Mason
Browse files

Btrfs: return error of btrfs_update_inode() to caller 



We didn't check error of btrfs_update_inode(), but that error looks
easy to bubble back up.

Reviewed-by: default avatarDavid Sterba <dsterba@suse.cz>
Signed-off-by: default avatarTsutomu Itoh <t-itoh@jp.fujitsu.com>
Signed-off-by: default avatarJosef Bacik <jbacik@fusionio.com>
parent 23291a04

fs/btrfs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -2833,7 +2833,7 @@ static int __btrfs_unlink_inode(struct btrfs_trans_handle *trans, 
	inode_inc_iversion(inode);

	inode_inc_iversion(dir);

	inode->i_ctime = dir->i_mtime = dir->i_ctime = CURRENT_TIME;

	btrfs_update_inode(trans, root, dir);

	ret = btrfs_update_inode(trans, root, dir);

out:

	return ret;

}

fs/btrfs/tree-log.c

+2 −2
Original line number Diff line number Diff line
@@ -637,7 +637,7 @@ static noinline int replay_one_extent(struct btrfs_trans_handle *trans, 
	}



	inode_set_bytes(inode, saved_nbytes);

	btrfs_update_inode(trans, root, inode);

	ret = btrfs_update_inode(trans, root, inode);

out:

	if (inode)

		iput(inode);
@@ -1133,7 +1133,7 @@ static noinline int link_to_fixup_dir(struct btrfs_trans_handle *trans, 
	btrfs_release_path(path);

	if (ret == 0) {

		btrfs_inc_nlink(inode);

		btrfs_update_inode(trans, root, inode);

		ret = btrfs_update_inode(trans, root, inode);

	} else if (ret == -EEXIST) {

		ret = 0;

	} else {