lkml.org 
[lkml]   [2016]   [Feb]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.13.y-ckt 118/136] Btrfs: clean up an error code in btrfs_init_space_info()
    Date
    3.13.11-ckt34 -stable review patch.  If anyone has any objections, please let me know.

    ---8<------------------------------------------------------------

    From: Dan Carpenter <dan.carpenter@oracle.com>

    commit 0dc924c5f2a3c4d999e12feaccee5f970cea1315 upstream.

    If we return 1 here, then the caller treats it as an error and returns
    -EINVAL. It causes a static checker warning to treat positive returns
    as an error.

    Fixes: 1aba86d67f34 ('Btrfs: fix easily get into ENOSPC in mixed case')
    Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
    Signed-off-by: David Sterba <dsterba@suse.com>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    fs/btrfs/extent-tree.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
    index 2e561e0..30f7ece 100644
    --- a/fs/btrfs/extent-tree.c
    +++ b/fs/btrfs/extent-tree.c
    @@ -8842,7 +8842,7 @@ int btrfs_init_space_info(struct btrfs_fs_info *fs_info)

    disk_super = fs_info->super_copy;
    if (!btrfs_super_root(disk_super))
    - return 1;
    + return -EINVAL;

    features = btrfs_super_incompat_flags(disk_super);
    if (features & BTRFS_FEATURE_INCOMPAT_MIXED_GROUPS)
    --
    1.9.1
    \
     
     \ /
      Last update: 2016-02-02 20:01    [W:4.071 / U:0.272 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site