git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'akpm' (patches from Andrew)
[sfrench/cifs-2.6.git]
/
fs
/
btrfs
/
inode.c
diff --git
a/fs/btrfs/inode.c
b/fs/btrfs/inode.c
index 2e7143ff552302444c7412f5720305f607c18797..c10d5d0ddea195b12b31a3c633b1f620f04f80e8 100644
(file)
--- a/
fs/btrfs/inode.c
+++ b/
fs/btrfs/inode.c
@@
-8819,7
+8819,7
@@
struct inode *btrfs_alloc_inode(struct super_block *sb)
struct btrfs_inode *ei;
struct inode *inode;
- ei =
kmem_cache_alloc(
btrfs_inode_cachep, GFP_KERNEL);
+ ei =
alloc_inode_sb(sb,
btrfs_inode_cachep, GFP_KERNEL);
if (!ei)
return NULL;