Commit 166c69fe authored by Alexander Viro's avatar Alexander Viro Committed by Linus Torvalds

[PATCH] removal of ifdef MODULE from fs/openpromfs

	Removes gratitious ifdefs - get_nodes() is only called from __init
and by itself, check_space() is only called by get_nodes(), so they can
be made unconditionally __init.
parent 48c98998
...@@ -921,11 +921,7 @@ static int openpromfs_unlink (struct inode *dir, struct dentry *dentry) ...@@ -921,11 +921,7 @@ static int openpromfs_unlink (struct inode *dir, struct dentry *dentry)
} }
/* {{{ init section */ /* {{{ init section */
#ifndef MODULE
static int __init check_space (u16 n) static int __init check_space (u16 n)
#else
static int check_space (u16 n)
#endif
{ {
unsigned long pages; unsigned long pages;
...@@ -945,11 +941,7 @@ static int check_space (u16 n) ...@@ -945,11 +941,7 @@ static int check_space (u16 n)
return 0; return 0;
} }
#ifndef MODULE
static u16 __init get_nodes (u16 parent, u32 node) static u16 __init get_nodes (u16 parent, u32 node)
#else
static u16 get_nodes (u16 parent, u32 node)
#endif
{ {
char *p; char *p;
u16 n = last_node++, i; u16 n = last_node++, i;
...@@ -1035,6 +1027,7 @@ static int openprom_fill_super(struct super_block *s, void *data, int silent) ...@@ -1035,6 +1027,7 @@ static int openprom_fill_super(struct super_block *s, void *data, int silent)
{ {
struct inode * root_inode; struct inode * root_inode;
s->s_flags |= MS_NODIRATIME;
s->s_blocksize = 1024; s->s_blocksize = 1024;
s->s_blocksize_bits = 10; s->s_blocksize_bits = 10;
s->s_magic = OPENPROM_SUPER_MAGIC; s->s_magic = OPENPROM_SUPER_MAGIC;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment