diff options
| author | Filipe Manana | 2014-03-03 13:28:40 +0100 |
|---|---|---|
| committer | Josef Bacik | 2014-03-10 20:17:18 +0100 |
| commit | fcbd2154d16431395e86a48859a5b547c33c09ad (patch) | |
| tree | 0e99d795e6ff65abb5b923e5d5adf1113da50691 /fs/btrfs/send.c | |
| parent | Btrfs: make defrag not fragment files when using prealloc extents (diff) | |
| download | kernel-qcow2-linux-fcbd2154d16431395e86a48859a5b547c33c09ad.tar.gz kernel-qcow2-linux-fcbd2154d16431395e86a48859a5b547c33c09ad.tar.xz kernel-qcow2-linux-fcbd2154d16431395e86a48859a5b547c33c09ad.zip | |
Btrfs: avoid unnecessary utimes update in incremental send
When we're finishing processing of an inode, if we're dealing with a
directory inode that has a pending move/rename operation, we don't
need to send a utimes update instruction to the send stream, as we'll
do it later after doing the move/rename operation. Therefore we save
some time here building paths and doing btree lookups.
Signed-off-by: Filipe David Borba Manana <fdmanana@gmail.com>
Signed-off-by: Josef Bacik <jbacik@fb.com>
Diffstat (limited to 'fs/btrfs/send.c')
| -rw-r--r-- | fs/btrfs/send.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c index c2522e4e2c59..9d057ef5adef 100644 --- a/fs/btrfs/send.c +++ b/fs/btrfs/send.c @@ -4957,18 +4957,19 @@ static int finish_inode_if_needed(struct send_ctx *sctx, int at_end) ret = apply_children_dir_moves(sctx); if (ret) goto out; + /* + * Need to send that every time, no matter if it actually + * changed between the two trees as we have done changes to + * the inode before. If our inode is a directory and it's + * waiting to be moved/renamed, we will send its utimes when + * it's moved/renamed, therefore we don't need to do it here. + */ + sctx->send_progress = sctx->cur_ino + 1; + ret = send_utimes(sctx, sctx->cur_ino, sctx->cur_inode_gen); + if (ret < 0) + goto out; } - /* - * Need to send that every time, no matter if it actually - * changed between the two trees as we have done changes to - * the inode before. - */ - sctx->send_progress = sctx->cur_ino + 1; - ret = send_utimes(sctx, sctx->cur_ino, sctx->cur_inode_gen); - if (ret < 0) - goto out; - out: return ret; } |