From 0bdfe2e2af577f1fac36817e4a52a1b1b4936efd Mon Sep 17 00:00:00 2001 From: Josef Bacik Date: Wed, 26 Sep 2012 11:07:06 -0400 Subject: [PATCH] --- yaml --- r: 332597 b: refs/heads/master c: 6f1fed775316d58ba356b2ce62de600ad00f003a h: refs/heads/master i: 332595: 0d2572f76e8fdc8b707c17fcef0d45e0aac5a9cb v: v3 --- [refs] | 2 +- trunk/fs/btrfs/tree-log.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 78a8d661cb30..5f97a860de0e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e6138876ad8327250d77291b3262fee356267211 +refs/heads/master: 6f1fed775316d58ba356b2ce62de600ad00f003a diff --git a/trunk/fs/btrfs/tree-log.c b/trunk/fs/btrfs/tree-log.c index f4b9e54b1da2..31b46a9e94cc 100644 --- a/trunk/fs/btrfs/tree-log.c +++ b/trunk/fs/btrfs/tree-log.c @@ -3011,8 +3011,7 @@ static noinline int copy_items(struct btrfs_trans_handle *trans, continue; found_type = btrfs_file_extent_type(src, extent); - if (found_type == BTRFS_FILE_EXTENT_REG || - found_type == BTRFS_FILE_EXTENT_PREALLOC) { + if (found_type == BTRFS_FILE_EXTENT_REG) { u64 ds, dl, cs, cl; ds = btrfs_file_extent_disk_bytenr(src, extent);