diff options
| author | Chris Mason <chris.mason@oracle.com> | 2012-01-16 15:26:31 -0500 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2012-01-16 15:26:31 -0500 |
| commit | 9785dbdf265ddc47d5c88267d89a97648c0dc14b (patch) | |
| tree | 3a97a48d6f282f9e06c5446beeb886fcd86c4798 /fs/btrfs/inode.c | |
| parent | d756bd2d9339447c29bde950910586df8f8941ec (diff) | |
| parent | 6bf7e080d5bcb0d399ee38ce3dabbfad64448192 (diff) | |
Merge branch 'for-chris' of git://git.jan-o-sch.net/btrfs-unstable into integration
Diffstat (limited to 'fs/btrfs/inode.c')
| -rw-r--r-- | fs/btrfs/inode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index fd1a06df5bc6..acc4ff39ca4e 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c | |||
| @@ -3179,7 +3179,7 @@ delete: | |||
| 3179 | ret = btrfs_free_extent(trans, root, extent_start, | 3179 | ret = btrfs_free_extent(trans, root, extent_start, |
| 3180 | extent_num_bytes, 0, | 3180 | extent_num_bytes, 0, |
| 3181 | btrfs_header_owner(leaf), | 3181 | btrfs_header_owner(leaf), |
| 3182 | ino, extent_offset); | 3182 | ino, extent_offset, 0); |
| 3183 | BUG_ON(ret); | 3183 | BUG_ON(ret); |
| 3184 | } | 3184 | } |
| 3185 | 3185 | ||
| @@ -5121,7 +5121,7 @@ again: | |||
| 5121 | } | 5121 | } |
| 5122 | flush_dcache_page(page); | 5122 | flush_dcache_page(page); |
| 5123 | } else if (create && PageUptodate(page)) { | 5123 | } else if (create && PageUptodate(page)) { |
| 5124 | WARN_ON(1); | 5124 | BUG(); |
| 5125 | if (!trans) { | 5125 | if (!trans) { |
| 5126 | kunmap(page); | 5126 | kunmap(page); |
| 5127 | free_extent_map(em); | 5127 | free_extent_map(em); |