Prev: [066/111] Btrfs: deal with NULL acl sent to btrfs_set_acl
Next: [095/111] ACPI: Fix regression where _PPC is not read at boot even when ignore_ppc=0
From: Greg KH on 11 Aug 2010 20:40
2.6.32-stable review patch. If anyone has any objections, please let us know.

------------------

From: Chris Mason <chris.mason(a)oracle.com>

commit 3a1abec9f6880cf406593c392636199ea1c6c917 upstream.

The recent patch to make fallocate enospc friendly would send
down a NULL trans handle to the allocator. This moves the
transaction start to properly fix things.

Signed-off-by: Chris Mason <chris.mason(a)oracle.com>
Acked-by: Jeff Mahoney <jeffm(a)suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh(a)suse.de>


---
fs/btrfs/inode.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)

--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -5802,23 +5802,23 @@ static int prealloc_file_range(struct in
while (num_bytes > 0) {
alloc_size = min(num_bytes, root->fs_info->max_extent);

+ trans = btrfs_start_transaction(root, 1);
+
ret = btrfs_reserve_extent(trans, root, alloc_size,
root->sectorsize, 0, alloc_hint,
(u64)-1, &ins, 1);
if (ret) {
WARN_ON(1);
- break;
+ goto stop_trans;
}

ret = btrfs_reserve_metadata_space(root, 3);
if (ret) {
btrfs_free_reserved_extent(root, ins.objectid,
ins.offset);
- break;
+ goto stop_trans;
}

- trans = btrfs_start_transaction(root, 1);
-
ret = insert_reserved_file_extent(trans, inode,
cur_offset, ins.objectid,
ins.offset, ins.offset,
@@ -5847,6 +5847,11 @@ static int prealloc_file_range(struct in
btrfs_unreserve_metadata_space(root, 3);
}
return ret;
+
+stop_trans:
+ btrfs_end_transaction(trans, root);
+ return ret;
+
}

static long btrfs_fallocate(struct inode *inode, int mode,


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: [066/111] Btrfs: deal with NULL acl sent to btrfs_set_acl
Next: [095/111] ACPI: Fix regression where _PPC is not read at boot even when ignore_ppc=0