diff options
| author | Chris Mason <chris.mason@oracle.com> | 2011-05-23 20:37:47 +0200 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2011-05-23 20:37:47 +0200 |
| commit | d6c0cb379c5198487e4ac124728cbb2346d63b1f (patch) | |
| tree | 167a97ac58c7a2fbf7c4e94b6abbfe1e03af014a /fs/btrfs/inode.c | |
| parent | Btrfs: do not flush csum items of unchanged file data during treelog (diff) | |
| parent | Btrfs: using rcu lock in the reader side of devices list (diff) | |
| download | linux-d6c0cb379c5198487e4ac124728cbb2346d63b1f.tar.xz linux-d6c0cb379c5198487e4ac124728cbb2346d63b1f.zip | |
Merge branch 'cleanups_and_fixes' into inode_numbers
Conflicts:
fs/btrfs/tree-log.c
fs/btrfs/volumes.c
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/inode.c')
| -rw-r--r-- | fs/btrfs/inode.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 4d8ef95abf40..d378f8b70ef7 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -1323,7 +1323,7 @@ static int btrfs_set_bit_hook(struct inode *inode, /* * set_bit and clear bit hooks normally require _irqsave/restore - * but in this case, we are only testeing for the DELALLOC + * but in this case, we are only testing for the DELALLOC * bit, which is only set or cleared with irqs on */ if (!(state->state & EXTENT_DELALLOC) && (*bits & EXTENT_DELALLOC)) { @@ -1356,7 +1356,7 @@ static int btrfs_clear_bit_hook(struct inode *inode, { /* * set_bit and clear bit hooks normally require _irqsave/restore - * but in this case, we are only testeing for the DELALLOC + * but in this case, we are only testing for the DELALLOC * bit, which is only set or cleared with irqs on */ if ((state->state & EXTENT_DELALLOC) && (*bits & EXTENT_DELALLOC)) { @@ -3286,7 +3286,6 @@ search_again: btrfs_file_extent_calc_inline_size(size); ret = btrfs_truncate_item(trans, root, path, size, 1); - BUG_ON(ret); } else if (root->ref_cows) { inode_sub_bytes(inode, item_end + 1 - found_key.offset); @@ -7167,6 +7166,7 @@ static int btrfs_symlink(struct inode *dir, struct dentry *dentry, datasize); if (err) { drop_inode = 1; + btrfs_free_path(path); goto out_unlock; } leaf = path->nodes[0]; |