Merge branch 'akpm' (Andrew's patch-bomb)

[linux-2.6-block.git] / fs / pstore / inode.c

diff --git a/fs/pstore/inode.c b/fs/pstore/inode.c
index 8ae5a03376aea859bdd4f8db90e1b9f706d2df17..19507889bb7ff123b3922fa439fc0c8ef1ded913 100644 (file)
--- a/fs/pstore/inode.c
+++ b/fs/pstore/inode.c
@@ -99,26 +99,12 @@ static const struct inode_operations pstore_dir_inode_operations = {
        .unlink         = pstore_unlink,
 };
 
-static struct inode *pstore_get_inode(struct super_block *sb,
-                                       const struct inode *dir, int mode, dev_t dev)
+static struct inode *pstore_get_inode(struct super_block *sb)
 {
        struct inode *inode = new_inode(sb);
-
        if (inode) {
                inode->i_ino = get_next_ino();
-               inode->i_uid = inode->i_gid = 0;
-               inode->i_mode = mode;
                inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
-               switch (mode & S_IFMT) {
-               case S_IFREG:
-                       inode->i_fop = &pstore_file_operations;
-                       break;
-               case S_IFDIR:
-                       inode->i_op = &pstore_dir_inode_operations;
-                       inode->i_fop = &simple_dir_operations;
-                       inc_nlink(inode);
-                       break;
-               }
        }
        return inode;
 }
@@ -210,9 +196,11 @@ int pstore_mkfile(enum pstore_type_id type, char *psname, u64 id,
                return rc;
 
        rc = -ENOMEM;
-       inode = pstore_get_inode(pstore_sb, root->d_inode, S_IFREG | 0444, 0);
+       inode = pstore_get_inode(pstore_sb);
        if (!inode)
                goto fail;
+       inode->i_mode = S_IFREG | 0444;
+       inode->i_fop = &pstore_file_operations;
        private = kmalloc(sizeof *private + size, GFP_KERNEL);
        if (!private)
                goto fail_alloc;
@@ -287,10 +275,12 @@ int pstore_fill_super(struct super_block *sb, void *data, int silent)
 
        parse_options(data);
 
-       inode = pstore_get_inode(sb, NULL, S_IFDIR | 0755, 0);
+       inode = pstore_get_inode(sb);
        if (inode) {
-               /* override ramfs "dir" options so we catch unlink(2) */
+               inode->i_mode = S_IFDIR | 0755;
                inode->i_op = &pstore_dir_inode_operations;
+               inode->i_fop = &simple_dir_operations;
+               inc_nlink(inode);
        }
        sb->s_root = d_make_root(inode);
        if (!sb->s_root)