diff options
| author | Chris Mason <clm@fb.com> | 2016-07-26 13:07:05 -0700 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2016-07-26 13:07:05 -0700 |
| commit | 023a824f04754a4ed5efc16ee8e41bb932878b0b (patch) | |
| tree | 8ae0bc5a61945bdec42d6c7a929967c548031d5d /fs/btrfs/delayed-inode.c | |
| parent | 8b8b08cbfb9021af4b54b4175fc4c51d655aac8c (diff) | |
| parent | 66642832f06a4351e23cea6cf254967c227f8224 (diff) | |
Merge branch 'kdave-v4.8' into for-linus-4.8
Diffstat (limited to 'fs/btrfs/delayed-inode.c')
| -rw-r--r-- | fs/btrfs/delayed-inode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c index dd3c040139a2..3eeb9cd8cfa5 100644 --- a/fs/btrfs/delayed-inode.c +++ b/fs/btrfs/delayed-inode.c @@ -34,7 +34,7 @@ int __init btrfs_delayed_inode_init(void) delayed_node_cache = kmem_cache_create("btrfs_delayed_node", sizeof(struct btrfs_delayed_node), 0, - SLAB_RECLAIM_ACCOUNT | SLAB_MEM_SPREAD, + SLAB_MEM_SPREAD, NULL); if (!delayed_node_cache) return -ENOMEM; @@ -1170,7 +1170,7 @@ static int __btrfs_run_delayed_items(struct btrfs_trans_handle *trans, if (ret) { btrfs_release_delayed_node(curr_node); curr_node = NULL; - btrfs_abort_transaction(trans, root, ret); + btrfs_abort_transaction(trans, ret); break; } |