diff options
author | Chris Mason <chris.mason@oracle.com> | 2007-04-10 13:20:21 -0400 |
---|---|---|
committer | David Woodhouse <dwmw2@hera.kernel.org> | 2007-04-10 13:20:21 -0400 |
commit | 48ddc6f44b5a167c00573b6012727d674e9c667a (patch) | |
tree | b382eeb58ed0f7644e1b84b9fa752d8c24b64176 /fs/btrfs | |
parent | d0dbc6245cefa36e19dff49c557ccf05e3063e9c (diff) |
Btrfs: cow file extents before writing
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs')
-rw-r--r-- | fs/btrfs/super.c | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index 3e8bfb0e5d7e..91aa1b4c50af 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c | |||
@@ -1020,7 +1020,7 @@ static int btrfs_get_block_lock(struct inode *inode, sector_t iblock, | |||
1020 | 1020 | ||
1021 | ret = btrfs_lookup_file_extent(trans, root, path, | 1021 | ret = btrfs_lookup_file_extent(trans, root, path, |
1022 | inode->i_ino, | 1022 | inode->i_ino, |
1023 | iblock << inode->i_blkbits, 0); | 1023 | iblock << inode->i_blkbits, 1); |
1024 | if (ret < 0) { | 1024 | if (ret < 0) { |
1025 | err = ret; | 1025 | err = ret; |
1026 | goto out; | 1026 | goto out; |
@@ -1040,9 +1040,25 @@ static int btrfs_get_block_lock(struct inode *inode, sector_t iblock, | |||
1040 | blocknr = btrfs_file_extent_disk_blocknr(item); | 1040 | blocknr = btrfs_file_extent_disk_blocknr(item); |
1041 | blocknr += btrfs_file_extent_offset(item); | 1041 | blocknr += btrfs_file_extent_offset(item); |
1042 | 1042 | ||
1043 | /* exact match found, use it */ | 1043 | /* exact match found, use it, FIXME, deal with extents |
1044 | * other than the page size | ||
1045 | */ | ||
1044 | if (ret == 0) { | 1046 | if (ret == 0) { |
1045 | err = 0; | 1047 | err = 0; |
1048 | BUG_ON(btrfs_file_extent_disk_num_blocks(item) != 1); | ||
1049 | if (btrfs_file_extent_generation(item) != trans->transid) { | ||
1050 | struct btrfs_key ins; | ||
1051 | ret = btrfs_alloc_extent(trans, root, 1, | ||
1052 | blocknr, (u64)-1, &ins); | ||
1053 | BUG_ON(ret); | ||
1054 | btrfs_set_file_extent_disk_blocknr(item, ins.objectid); | ||
1055 | mark_buffer_dirty(path->nodes[0]); | ||
1056 | ret = btrfs_free_extent(trans, root, | ||
1057 | blocknr, 1, 0); | ||
1058 | BUG_ON(ret); | ||
1059 | blocknr = ins.objectid; | ||
1060 | |||
1061 | } | ||
1046 | map_bh(result, inode->i_sb, blocknr); | 1062 | map_bh(result, inode->i_sb, blocknr); |
1047 | goto out; | 1063 | goto out; |
1048 | } | 1064 | } |