| Message ID | 1354158719-15615-1-git-send-email-chenyang.fnst@cn.fujitsu.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Nov 29, 2012 at 4:11 AM, Chen Yang <chenyang.fnst@cn.fujitsu.com> wrote: > when send/receive a sparse file, the holes of the original file > will be filled with zero. The holes will be sent as ZERO streams, > and it's unnecessary. > > So, I improved this by skipping the hole of file while sending. > > Signed-off-by: Cheng Yang <chenyang.fnst@cn.fujitsu.com> > --- > fs/btrfs/send.c | 6 ++++++ > 1 files changed, 6 insertions(+), 0 deletions(-) > > diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c > index e78b297..1e1d59a 100644 > --- a/fs/btrfs/send.c > +++ b/fs/btrfs/send.c > @@ -3718,6 +3718,7 @@ static int send_write_or_clone(struct send_ctx *sctx, > u64 pos = 0; > u64 len; > u32 l; > + u64 bytenr; > u8 type; > > ei = btrfs_item_ptr(path->nodes[0], path->slots[0], > @@ -3732,6 +3733,11 @@ static int send_write_or_clone(struct send_ctx *sctx, > */ > len = PAGE_CACHE_ALIGN(len); > } else { > + bytenr = btrfs_file_extent_disk_bytenr(path->nodes[0], ei); > + if (bytenr == 0) { > + ret = 0; > + goto out; > + } > len = btrfs_file_extent_num_bytes(path->nodes[0], ei); > } > > -- > 1.7.7.6 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html This won't work for incremental sends if I understand it correctly. If the hole got punched into the file after the initial send, the data will be unchanged on the receiving side when receiving incrementally. -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c index e78b297..1e1d59a 100644 --- a/fs/btrfs/send.c +++ b/fs/btrfs/send.c @@ -3718,6 +3718,7 @@ static int send_write_or_clone(struct send_ctx *sctx, u64 pos = 0; u64 len; u32 l; + u64 bytenr; u8 type; ei = btrfs_item_ptr(path->nodes[0], path->slots[0], @@ -3732,6 +3733,11 @@ static int send_write_or_clone(struct send_ctx *sctx, */ len = PAGE_CACHE_ALIGN(len); } else { + bytenr = btrfs_file_extent_disk_bytenr(path->nodes[0], ei); + if (bytenr == 0) { + ret = 0; + goto out; + } len = btrfs_file_extent_num_bytes(path->nodes[0], ei); }
when send/receive a sparse file, the holes of the original file will be filled with zero. The holes will be sent as ZERO streams, and it's unnecessary. So, I improved this by skipping the hole of file while sending. Signed-off-by: Cheng Yang <chenyang.fnst@cn.fujitsu.com> --- fs/btrfs/send.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-)