Mountable btrfs, with readdir

[linux-2.6-block.git] / fs / btrfs / transaction.h

diff --git a/fs/btrfs/transaction.h b/fs/btrfs/transaction.h
index 3adb6e69fe43d832e252244d60cda7708426ec98..9ab27b7491c55c832a5c88969e66246a1d629b2d 100644 (file)
--- a/fs/btrfs/transaction.h
+++ b/fs/btrfs/transaction.h
@@ -10,7 +10,7 @@ struct btrfs_trans_handle {
 static inline struct btrfs_trans_handle *
 btrfs_start_transaction(struct btrfs_root *root, int num_blocks)
 {
-       struct btrfs_trans_handle *h = malloc(sizeof(*h));
+       struct btrfs_trans_handle *h = kmalloc(sizeof(*h), GFP_NOFS);
        h->transid = root->root_key.offset;
        h->blocks_reserved = num_blocks;
        h->blocks_used = 0;
@@ -21,7 +21,7 @@ static inline void btrfs_free_transaction(struct btrfs_root *root,
                                          struct btrfs_trans_handle *handle)
 {
        memset(handle, 0, sizeof(*handle));
-       free(handle);
+       kfree(handle);
 }
 
 #endif