diff options
Diffstat (limited to 'fs/ext2/super.c')
-rw-r--r-- | fs/ext2/super.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/ext2/super.c b/fs/ext2/super.c index cb6f9bd658de..7e30bae174ed 100644 --- a/fs/ext2/super.c +++ b/fs/ext2/super.c | |||
@@ -175,7 +175,8 @@ static int init_inodecache(void) | |||
175 | { | 175 | { |
176 | ext2_inode_cachep = kmem_cache_create("ext2_inode_cache", | 176 | ext2_inode_cachep = kmem_cache_create("ext2_inode_cache", |
177 | sizeof(struct ext2_inode_info), | 177 | sizeof(struct ext2_inode_info), |
178 | 0, SLAB_RECLAIM_ACCOUNT, | 178 | 0, (SLAB_RECLAIM_ACCOUNT| |
179 | SLAB_MEM_SPREAD), | ||
179 | init_once, NULL); | 180 | init_once, NULL); |
180 | if (ext2_inode_cachep == NULL) | 181 | if (ext2_inode_cachep == NULL) |
181 | return -ENOMEM; | 182 | return -ENOMEM; |
@@ -210,8 +211,6 @@ static int ext2_show_options(struct seq_file *seq, struct vfsmount *vfs) | |||
210 | 211 | ||
211 | if (sbi->s_mount_opt & EXT2_MOUNT_GRPID) | 212 | if (sbi->s_mount_opt & EXT2_MOUNT_GRPID) |
212 | seq_puts(seq, ",grpid"); | 213 | seq_puts(seq, ",grpid"); |
213 | else | ||
214 | seq_puts(seq, ",nogrpid"); | ||
215 | 214 | ||
216 | #if defined(CONFIG_QUOTA) | 215 | #if defined(CONFIG_QUOTA) |
217 | if (sbi->s_mount_opt & EXT2_MOUNT_USRQUOTA) | 216 | if (sbi->s_mount_opt & EXT2_MOUNT_USRQUOTA) |
@@ -258,7 +257,6 @@ static struct super_operations ext2_sops = { | |||
258 | * systems, but can be improved upon. | 257 | * systems, but can be improved upon. |
259 | * Currently only get_parent is required. | 258 | * Currently only get_parent is required. |
260 | */ | 259 | */ |
261 | struct dentry *ext2_get_parent(struct dentry *child); | ||
262 | static struct export_operations ext2_export_ops = { | 260 | static struct export_operations ext2_export_ops = { |
263 | .get_parent = ext2_get_parent, | 261 | .get_parent = ext2_get_parent, |
264 | }; | 262 | }; |