summaryrefslogtreecommitdiffstats
path: root/fs/btrfs/ioctl.c
diff options
context:
space:
mode:
authorDavid Sterba <dsterba@suse.com>2016-02-26 15:38:34 +0100
committerDavid Sterba <dsterba@suse.com>2016-02-26 15:38:34 +0100
commitfa695b01bceabc40be3267d309ca8a663de53d7a (patch)
tree017a66e7b0c2d928d3edc9531cf04bd3debf346a /fs/btrfs/ioctl.c
parentMerge branch 'cleanups-4.6' into for-chris-4.6 (diff)
parentbtrfs: change max_inline default to 2048 (diff)
downloadlinux-fa695b01bceabc40be3267d309ca8a663de53d7a.tar.xz
linux-fa695b01bceabc40be3267d309ca8a663de53d7a.zip
Merge branch 'misc-4.6' into for-chris-4.6
# Conflicts: # fs/btrfs/file.c
Diffstat (limited to 'fs/btrfs/ioctl.c')
-rw-r--r--fs/btrfs/ioctl.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index 6110d8c386a5..c1193b0c5e49 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -2093,8 +2093,6 @@ static noinline int search_ioctl(struct inode *inode,
key.offset = (u64)-1;
root = btrfs_read_fs_root_no_name(info, &key);
if (IS_ERR(root)) {
- btrfs_err(info, "could not find root %llu",
- sk->tree_id);
btrfs_free_path(path);
return -ENOENT;
}