diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-01-16 16:57:54 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-01-16 16:57:54 +0100 |
| commit | 11cca3d12f03c670a6dd14004d40580918898760 (patch) | |
| tree | 495a745eaf5c44d08f8b1fb01b61733dc0e78c70 /fs/btrfs/uuid-tree.c | |
| parent | a2d6a987bfe4a2e344fae9d255200072eb082427 (diff) | |
| parent | 49def1853334396f948dcb4cedb9347abb318df5 (diff) | |
| download | linux-11cca3d12f03c670a6dd14004d40580918898760.tar.gz linux-11cca3d12f03c670a6dd14004d40580918898760.tar.bz2 linux-11cca3d12f03c670a6dd14004d40580918898760.zip | |
Merge 4.10-rc4 into tty-next
We want the serial/tty fixes in here as well to build on top of.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/btrfs/uuid-tree.c')
| -rw-r--r-- | fs/btrfs/uuid-tree.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/btrfs/uuid-tree.c b/fs/btrfs/uuid-tree.c index 161342b73ce5..726f928238d0 100644 --- a/fs/btrfs/uuid-tree.c +++ b/fs/btrfs/uuid-tree.c @@ -352,7 +352,5 @@ skip: out: btrfs_free_path(path); - if (ret) - btrfs_warn(fs_info, "btrfs_uuid_tree_iterate failed %d", ret); - return 0; + return ret; } |