aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs/transaction.h
diff options
context:
space:
mode:
authorChris Mason <chris.mason@oracle.com>2007-03-22 12:13:20 -0400
committerDavid Woodhouse <dwmw2@hera.kernel.org>2007-03-22 12:13:20 -0400
commite20d96d64f9cf9288ffecc9ad4714e91c3b97ca8 (patch)
treefbe07d48bc7997226075169118ffa2a2e63f5d51 /fs/btrfs/transaction.h
parent2e635a278354a1a7951e16cfea4c247d6d0e7c99 (diff)
Mountable btrfs, with readdir
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/transaction.h')
-rw-r--r--fs/btrfs/transaction.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/transaction.h b/fs/btrfs/transaction.h
index 3adb6e69fe43..9ab27b7491c5 100644
--- a/fs/btrfs/transaction.h
+++ b/fs/btrfs/transaction.h
@@ -10,7 +10,7 @@ struct btrfs_trans_handle {
10static inline struct btrfs_trans_handle * 10static inline struct btrfs_trans_handle *
11btrfs_start_transaction(struct btrfs_root *root, int num_blocks) 11btrfs_start_transaction(struct btrfs_root *root, int num_blocks)
12{ 12{
13 struct btrfs_trans_handle *h = malloc(sizeof(*h)); 13 struct btrfs_trans_handle *h = kmalloc(sizeof(*h), GFP_NOFS);
14 h->transid = root->root_key.offset; 14 h->transid = root->root_key.offset;
15 h->blocks_reserved = num_blocks; 15 h->blocks_reserved = num_blocks;
16 h->blocks_used = 0; 16 h->blocks_used = 0;
@@ -21,7 +21,7 @@ static inline void btrfs_free_transaction(struct btrfs_root *root,
21 struct btrfs_trans_handle *handle) 21 struct btrfs_trans_handle *handle)
22{ 22{
23 memset(handle, 0, sizeof(*handle)); 23 memset(handle, 0, sizeof(*handle));
24 free(handle); 24 kfree(handle);
25} 25}
26 26
27#endif 27#endif