diff options
| author |   Filipe David Borba Manana <fdmanana@gmail.com> | 2013-12-12 19:19:52 +0000 |
|---|---|---|
| committer |   Chris Mason <clm@fb.com> | 2014-01-07 14:29:53 -0800 |
| commit | a220765e8f936883d9968dd79cba0e230729f70e (patch) | |
| tree | a1b48c7104d32a680b0d8d2ace82f7e07fe540ff | |
| parent | 2880a9b2ee611e81e6716d9f01bdbe26bf56459d (diff) | |
| download | btrfs-next-a220765e8f936883d9968dd79cba0e230729f70e.tar.gz | |
Btrfs: return immediately if tree log mod is not necessary
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>
| -rw-r--r-- | fs/btrfs/ctree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c index a57507aa6702..59664f6cbc4e 100644 --- a/fs/btrfs/ctree.c +++ b/fs/btrfs/ctree.c @@ -771,7 +771,7 @@ tree_mod_log_set_node_key(struct btrfs_fs_info *fs_info, { 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); |