projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[linux-2.6-microblaze.git]
/
fs
/
locks.c
diff --git
a/fs/locks.c
b/fs/locks.c
index
51a5b72
..
3d6fb4a
100644
(file)
--- a/
fs/locks.c
+++ b/
fs/locks.c
@@
-2941,12
+2941,10
@@
static int __init filelock_init(void)
int i;
flctx_cache = kmem_cache_create("file_lock_ctx",
int i;
flctx_cache = kmem_cache_create("file_lock_ctx",
- sizeof(struct file_lock_context), 0,
- SLAB_PANIC | SLAB_ACCOUNT, NULL);
+ sizeof(struct file_lock_context), 0, SLAB_PANIC, NULL);
filelock_cache = kmem_cache_create("file_lock_cache",
filelock_cache = kmem_cache_create("file_lock_cache",
- sizeof(struct file_lock), 0,
- SLAB_PANIC | SLAB_ACCOUNT, NULL);
+ sizeof(struct file_lock), 0, SLAB_PANIC, NULL);
for_each_possible_cpu(i) {
struct file_lock_list_struct *fll = per_cpu_ptr(&file_lock_list, i);
for_each_possible_cpu(i) {
struct file_lock_list_struct *fll = per_cpu_ptr(&file_lock_list, i);