lkml.org 
[lkml]   [2014]   [Feb]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.5 67/88] Btrfs: handle EAGAIN case properly in btrfs_drop_snapshot()
    Date
    3.5.7.30 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Wang Shilong <wangsl.fnst@cn.fujitsu.com>

    commit 90515e7f5d7d24cbb2a4038a3f1b5cfa2921aa17 upstream.

    We may return early in btrfs_drop_snapshot(), we shouldn't
    call btrfs_std_err() for this case, fix it.

    Signed-off-by: Wang Shilong <wangsl.fnst@cn.fujitsu.com>
    Signed-off-by: Josef Bacik <jbacik@fb.com>
    Signed-off-by: Chris Mason <clm@fb.com>
    [ luis: backported to 3.5: adjusted context ]
    Signed-off-by: Luis Henriques <luis.henriques@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 6bb1213..a37ec94 100644
    --- a/fs/btrfs/extent-tree.c
    +++ b/fs/btrfs/extent-tree.c
    @@ -7035,7 +7035,7 @@ out:
    */
    if (root_dropped == false)
    btrfs_add_dead_root(root);
    - if (err)
    + if (err && err != -EAGAIN)
    btrfs_std_error(root->fs_info, err);
    return err;
    }
    --
    1.8.3.2


    \
     
     \ /
      Last update: 2014-02-07 13:41    [W:3.160 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site