lkml.org 
[lkml]   [2014]   [Mar]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.13 137/149] Btrfs: return immediately if tree log mod is not necessary
    Date
    3.13-stable review patch.  If anyone has any objections, please let me know.

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

    From: Filipe David Borba Manana <fdmanana@gmail.com>

    commit 783577663507411e36e459390ef056556e93ef29 upstream.

    In ctree.c:tree_mod_log_set_node_key() we were calling
    __tree_mod_log_insert_key() even when the modification doesn't need
    to be logged. This would allocate a tree_mod_elem structure, fill it
    and pass it to __tree_mod_log_insert(), which would just acquire
    the tree mod log write lock and then free the tree_mod_elem structure
    and return (that is, a no-op).

    Therefore call tree_mod_log_insert() instead of __tree_mod_log_insert()
    which just returns immediately if the modification doesn't need to be
    logged (without allocating the structure, fill it, acquire write lock,
    free structure).

    Signed-off-by: Filipe David Borba Manana <fdmanana@gmail.com>
    Signed-off-by: Josef Bacik <jbacik@fb.com>
    Signed-off-by: Chris Mason <clm@fb.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    fs/btrfs/ctree.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/fs/btrfs/ctree.c
    +++ b/fs/btrfs/ctree.c
    @@ -772,7 +772,7 @@ tree_mod_log_set_node_key(struct btrfs_f
    {
    int ret;

    - ret = __tree_mod_log_insert_key(fs_info, eb, slot,
    + ret = tree_mod_log_insert_key(fs_info, eb, slot,
    MOD_LOG_KEY_REPLACE,
    atomic ? GFP_ATOMIC : GFP_NOFS);
    BUG_ON(ret < 0);



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