diff options
| author | Li Zefan <lizf@cn.fujitsu.com> | 2011-07-14 03:16:47 +0000 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2011-08-01 14:30:46 -0400 |
| commit | e55179b3d7d41d83fd6b5f59325f4a8d8ac9700a (patch) | |
| tree | 9f8ec3e2ec88e63b1772418ba6699b808e53fad3 /fs/btrfs | |
| parent | 77906a5075a4eb767026c2e07b1a412d08aea5be (diff) | |
| download | linux-3.10-e55179b3d7d41d83fd6b5f59325f4a8d8ac9700a.tar.gz linux-3.10-e55179b3d7d41d83fd6b5f59325f4a8d8ac9700a.tar.bz2 linux-3.10-e55179b3d7d41d83fd6b5f59325f4a8d8ac9700a.zip | |
Btrfs: check the nodatasum flag when writing compressed files
If mounting with nodatasum option, we won't csum file data for
general write or direct-io write, and this rule should also be
applied when writing compressed files.
Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs')
| -rw-r--r-- | fs/btrfs/compression.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c index bfe42b03eaf..8ec5d86f173 100644 --- a/fs/btrfs/compression.c +++ b/fs/btrfs/compression.c @@ -338,6 +338,7 @@ int btrfs_submit_compressed_write(struct inode *inode, u64 start, u64 first_byte = disk_start; struct block_device *bdev; int ret; + int skip_sum = BTRFS_I(inode)->flags & BTRFS_INODE_NODATASUM; WARN_ON(start & ((u64)PAGE_CACHE_SIZE - 1)); cb = kmalloc(compressed_bio_size(root, compressed_len), GFP_NOFS); @@ -392,8 +393,11 @@ int btrfs_submit_compressed_write(struct inode *inode, u64 start, ret = btrfs_bio_wq_end_io(root->fs_info, bio, 0); BUG_ON(ret); - ret = btrfs_csum_one_bio(root, inode, bio, start, 1); - BUG_ON(ret); + if (!skip_sum) { + ret = btrfs_csum_one_bio(root, inode, bio, + start, 1); + BUG_ON(ret); + } ret = btrfs_map_bio(root, WRITE, bio, 0, 1); BUG_ON(ret); @@ -418,8 +422,10 @@ int btrfs_submit_compressed_write(struct inode *inode, u64 start, ret = btrfs_bio_wq_end_io(root->fs_info, bio, 0); BUG_ON(ret); - ret = btrfs_csum_one_bio(root, inode, bio, start, 1); - BUG_ON(ret); + if (!skip_sum) { + ret = btrfs_csum_one_bio(root, inode, bio, start, 1); + BUG_ON(ret); + } ret = btrfs_map_bio(root, WRITE, bio, 0, 1); BUG_ON(ret); |