mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-05 02:19:51 +00:00
Btrfs: deal with api changes in 2.6.23-rc1
Signed-off-by: Chris Mason <chris.mason@oracle.com>
This commit is contained in:
parent
618e21d595
commit
92fee66d49
2 changed files with 33 additions and 26 deletions
|
@ -30,6 +30,7 @@
|
||||||
#include <linux/writeback.h>
|
#include <linux/writeback.h>
|
||||||
#include <linux/statfs.h>
|
#include <linux/statfs.h>
|
||||||
#include <linux/compat.h>
|
#include <linux/compat.h>
|
||||||
|
#include <linux/version.h>
|
||||||
#include "ctree.h"
|
#include "ctree.h"
|
||||||
#include "disk-io.h"
|
#include "disk-io.h"
|
||||||
#include "transaction.h"
|
#include "transaction.h"
|
||||||
|
@ -713,8 +714,12 @@ static int btrfs_sync_file(struct file *file,
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct vm_operations_struct btrfs_file_vm_ops = {
|
static struct vm_operations_struct btrfs_file_vm_ops = {
|
||||||
.nopage = filemap_nopage,
|
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)
|
||||||
.populate = filemap_populate,
|
.nopage = filemap_nopage,
|
||||||
|
.populate = filemap_populate,
|
||||||
|
#else
|
||||||
|
.fault = filemap_fault,
|
||||||
|
#endif
|
||||||
.page_mkwrite = btrfs_page_mkwrite,
|
.page_mkwrite = btrfs_page_mkwrite,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -31,6 +31,7 @@
|
||||||
#include <linux/statfs.h>
|
#include <linux/statfs.h>
|
||||||
#include <linux/compat.h>
|
#include <linux/compat.h>
|
||||||
#include <linux/bit_spinlock.h>
|
#include <linux/bit_spinlock.h>
|
||||||
|
#include <linux/version.h>
|
||||||
#include "ctree.h"
|
#include "ctree.h"
|
||||||
#include "disk-io.h"
|
#include "disk-io.h"
|
||||||
#include "transaction.h"
|
#include "transaction.h"
|
||||||
|
@ -2323,42 +2324,43 @@ void btrfs_destroy_cachep(void)
|
||||||
kmem_cache_destroy(btrfs_path_cachep);
|
kmem_cache_destroy(btrfs_path_cachep);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static struct kmem_cache *cache_create(const char *name, size_t size,
|
||||||
|
unsigned long extra_flags,
|
||||||
|
void (*ctor)(void *, struct kmem_cache *,
|
||||||
|
unsigned long))
|
||||||
|
{
|
||||||
|
return kmem_cache_create(name, size, 0, (SLAB_RECLAIM_ACCOUNT |
|
||||||
|
SLAB_MEM_SPREAD | extra_flags), ctor
|
||||||
|
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)
|
||||||
|
,NULL
|
||||||
|
#endif
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
int btrfs_init_cachep(void)
|
int btrfs_init_cachep(void)
|
||||||
{
|
{
|
||||||
btrfs_inode_cachep = kmem_cache_create("btrfs_inode_cache",
|
btrfs_inode_cachep = cache_create("btrfs_inode_cache",
|
||||||
sizeof(struct btrfs_inode),
|
sizeof(struct btrfs_inode),
|
||||||
0, (SLAB_RECLAIM_ACCOUNT|
|
0, init_once);
|
||||||
SLAB_MEM_SPREAD),
|
|
||||||
init_once, NULL);
|
|
||||||
if (!btrfs_inode_cachep)
|
if (!btrfs_inode_cachep)
|
||||||
goto fail;
|
goto fail;
|
||||||
btrfs_trans_handle_cachep = kmem_cache_create("btrfs_trans_handle_cache",
|
btrfs_trans_handle_cachep = cache_create("btrfs_trans_handle_cache",
|
||||||
sizeof(struct btrfs_trans_handle),
|
sizeof(struct btrfs_trans_handle),
|
||||||
0, (SLAB_RECLAIM_ACCOUNT|
|
0, NULL);
|
||||||
SLAB_MEM_SPREAD),
|
|
||||||
NULL, NULL);
|
|
||||||
if (!btrfs_trans_handle_cachep)
|
if (!btrfs_trans_handle_cachep)
|
||||||
goto fail;
|
goto fail;
|
||||||
btrfs_transaction_cachep = kmem_cache_create("btrfs_transaction_cache",
|
btrfs_transaction_cachep = cache_create("btrfs_transaction_cache",
|
||||||
sizeof(struct btrfs_transaction),
|
sizeof(struct btrfs_transaction),
|
||||||
0, (SLAB_RECLAIM_ACCOUNT|
|
0, NULL);
|
||||||
SLAB_MEM_SPREAD),
|
|
||||||
NULL, NULL);
|
|
||||||
if (!btrfs_transaction_cachep)
|
if (!btrfs_transaction_cachep)
|
||||||
goto fail;
|
goto fail;
|
||||||
btrfs_path_cachep = kmem_cache_create("btrfs_path_cache",
|
btrfs_path_cachep = cache_create("btrfs_path_cache",
|
||||||
sizeof(struct btrfs_transaction),
|
sizeof(struct btrfs_transaction),
|
||||||
0, (SLAB_RECLAIM_ACCOUNT|
|
0, NULL);
|
||||||
SLAB_MEM_SPREAD),
|
|
||||||
NULL, NULL);
|
|
||||||
if (!btrfs_path_cachep)
|
if (!btrfs_path_cachep)
|
||||||
goto fail;
|
goto fail;
|
||||||
btrfs_bit_radix_cachep = kmem_cache_create("btrfs_radix",
|
btrfs_bit_radix_cachep = cache_create("btrfs_radix", 256,
|
||||||
256,
|
SLAB_DESTROY_BY_RCU, NULL);
|
||||||
0, (SLAB_RECLAIM_ACCOUNT|
|
|
||||||
SLAB_MEM_SPREAD |
|
|
||||||
SLAB_DESTROY_BY_RCU),
|
|
||||||
NULL, NULL);
|
|
||||||
if (!btrfs_bit_radix_cachep)
|
if (!btrfs_bit_radix_cachep)
|
||||||
goto fail;
|
goto fail;
|
||||||
return 0;
|
return 0;
|
||||||
|
|
Loading…
Reference in a new issue