Commit 6d13f549 authored by David Sterba's avatar David Sterba Committed by Chris Mason

btrfs: fix warnings after changes in btrfs_abort_transaction

fs/btrfs/volumes.c: In function ‘btrfs_create_uuid_tree’:
fs/btrfs/volumes.c:3909:3: warning: format ‘%d’ expects argument of type ‘int’, but argument 4 has type ‘long int’ [-Wformat=]
   btrfs_abort_transaction(trans, tree_root,
   ^
  CC [M]  fs/btrfs/ioctl.o
fs/btrfs/ioctl.c: In function ‘create_subvol’:
fs/btrfs/ioctl.c:549:3: warning: format ‘%d’ expects argument of type ‘int’, but argument 4 has type ‘long int’ [-Wformat=]
   btrfs_abort_transaction(trans, root, PTR_ERR(new_root));

PTR_ERR returns long, but we're really using 'int' for the error codes
everywhere so just set and use the local variable.
Signed-off-by: default avatarDavid Sterba <dsterba@suse.cz>
Signed-off-by: default avatarChris Mason <clm@fb.com>
parent c0d19e2b
...@@ -553,8 +553,8 @@ static noinline int create_subvol(struct inode *dir, ...@@ -553,8 +553,8 @@ static noinline int create_subvol(struct inode *dir,
key.offset = (u64)-1; key.offset = (u64)-1;
new_root = btrfs_read_fs_root_no_name(root->fs_info, &key); new_root = btrfs_read_fs_root_no_name(root->fs_info, &key);
if (IS_ERR(new_root)) { if (IS_ERR(new_root)) {
btrfs_abort_transaction(trans, root, PTR_ERR(new_root));
ret = PTR_ERR(new_root); ret = PTR_ERR(new_root);
btrfs_abort_transaction(trans, root, ret);
goto fail; goto fail;
} }
......
...@@ -3908,9 +3908,9 @@ int btrfs_create_uuid_tree(struct btrfs_fs_info *fs_info) ...@@ -3908,9 +3908,9 @@ int btrfs_create_uuid_tree(struct btrfs_fs_info *fs_info)
uuid_root = btrfs_create_tree(trans, fs_info, uuid_root = btrfs_create_tree(trans, fs_info,
BTRFS_UUID_TREE_OBJECTID); BTRFS_UUID_TREE_OBJECTID);
if (IS_ERR(uuid_root)) { if (IS_ERR(uuid_root)) {
btrfs_abort_transaction(trans, tree_root, ret = PTR_ERR(uuid_root);
PTR_ERR(uuid_root)); btrfs_abort_transaction(trans, tree_root, ret);
return PTR_ERR(uuid_root); return ret;
} }
fs_info->uuid_root = uuid_root; fs_info->uuid_root = uuid_root;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment