diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-07-23 05:20:10 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-07-23 05:20:10 -0400 |
| commit | 39fe5434cb9de5da40510028b17b96bc4eb312b3 (patch) | |
| tree | 7a02a317b9ad57da51ca99887c119e779ccf3f13 /fs/fuse | |
| parent | 0fc72b81d3111d114ab378935b1cf07680ca1289 (diff) | |
| parent | f695baf2df9e0413d3521661070103711545207a (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/fuse')
| -rw-r--r-- | fs/fuse/dev.c | 2 | ||||
| -rw-r--r-- | fs/fuse/inode.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c index 357764d85ff1..3ad22beb24c2 100644 --- a/fs/fuse/dev.c +++ b/fs/fuse/dev.c | |||
| @@ -1044,7 +1044,7 @@ int __init fuse_dev_init(void) | |||
| 1044 | int err = -ENOMEM; | 1044 | int err = -ENOMEM; |
| 1045 | fuse_req_cachep = kmem_cache_create("fuse_request", | 1045 | fuse_req_cachep = kmem_cache_create("fuse_request", |
| 1046 | sizeof(struct fuse_req), | 1046 | sizeof(struct fuse_req), |
| 1047 | 0, 0, NULL, NULL); | 1047 | 0, 0, NULL); |
| 1048 | if (!fuse_req_cachep) | 1048 | if (!fuse_req_cachep) |
| 1049 | goto out; | 1049 | goto out; |
| 1050 | 1050 | ||
diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c index cc5efc13496a..5448f625ab56 100644 --- a/fs/fuse/inode.c +++ b/fs/fuse/inode.c | |||
| @@ -706,7 +706,7 @@ static int __init fuse_fs_init(void) | |||
| 706 | fuse_inode_cachep = kmem_cache_create("fuse_inode", | 706 | fuse_inode_cachep = kmem_cache_create("fuse_inode", |
| 707 | sizeof(struct fuse_inode), | 707 | sizeof(struct fuse_inode), |
| 708 | 0, SLAB_HWCACHE_ALIGN, | 708 | 0, SLAB_HWCACHE_ALIGN, |
| 709 | fuse_inode_init_once, NULL); | 709 | fuse_inode_init_once); |
| 710 | err = -ENOMEM; | 710 | err = -ENOMEM; |
| 711 | if (!fuse_inode_cachep) | 711 | if (!fuse_inode_cachep) |
| 712 | goto out_unreg2; | 712 | goto out_unreg2; |