Btrfs: early inline file data code
Signed-off-by: Chris Mason <chris.mason@oracle.com>
diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
index 453ce83..9ef65e2 100644
--- a/fs/btrfs/ctree.c
+++ b/fs/btrfs/ctree.c
@@ -16,21 +16,26 @@
static int del_ptr(struct btrfs_trans_handle *trans, struct btrfs_root *root,
struct btrfs_path *path, int level, int slot);
+inline void btrfs_init_path(struct btrfs_path *p)
+{
+ memset(p, 0, sizeof(*p));
+}
+
struct btrfs_path *btrfs_alloc_path(void)
{
- return kmem_cache_alloc(btrfs_path_cachep, GFP_NOFS);
+ struct btrfs_path *path;
+ path = kmem_cache_alloc(btrfs_path_cachep, GFP_NOFS);
+ if (path)
+ btrfs_init_path(path);
+ return path;
}
void btrfs_free_path(struct btrfs_path *p)
{
+ btrfs_release_path(NULL, p);
kmem_cache_free(btrfs_path_cachep, p);
}
-inline void btrfs_init_path(struct btrfs_path *p)
-{
- memset(p, 0, sizeof(*p));
-}
-
void btrfs_release_path(struct btrfs_root *root, struct btrfs_path *p)
{
int i;
@@ -77,6 +82,7 @@
btrfs_free_extent(trans, root, buf->b_blocknr, 1, 1);
}
btrfs_block_release(root, buf);
+ mark_buffer_dirty(cow);
*cow_ret = cow;
return 0;
}