Merge branch 'master' into gfs2

[pandora-kernel.git] / drivers / misc / ibmasm / ibmasmfs.c

diff --git a/drivers/misc/ibmasm/ibmasmfs.c b/drivers/misc/ibmasm/ibmasmfs.c
index 5c550fc..b99dc50 100644 (file)
--- a/drivers/misc/ibmasm/ibmasmfs.c
+++ b/drivers/misc/ibmasm/ibmasmfs.c
@@ -90,10 +90,11 @@ static void ibmasmfs_create_files (struct super_block *sb, struct dentry *root);
 static int ibmasmfs_fill_super (struct super_block *sb, void *data, int silent);
 
 
-static struct super_block *ibmasmfs_get_super(struct file_system_type *fst,
-                       int flags, const char *name, void *data)
+static int ibmasmfs_get_super(struct file_system_type *fst,
+                       int flags, const char *name, void *data,
+                       struct vfsmount *mnt)
 {
-       return get_sb_single(fst, flags, data, ibmasmfs_fill_super);
+       return get_sb_single(fst, flags, data, ibmasmfs_fill_super, mnt);
 }
 
 static struct super_operations ibmasmfs_s_ops = {
@@ -101,7 +102,7 @@ static struct super_operations ibmasmfs_s_ops = {
        .drop_inode     = generic_delete_inode,
 };
 
-static struct file_operations *ibmasmfs_dir_ops = &simple_dir_operations;
+static const struct file_operations *ibmasmfs_dir_ops = &simple_dir_operations;
 
 static struct file_system_type ibmasmfs_type = {
        .owner          = THIS_MODULE,
@@ -146,7 +147,6 @@ static struct inode *ibmasmfs_make_inode(struct super_block *sb, int mode)
        if (ret) {
                ret->i_mode = mode;
                ret->i_uid = ret->i_gid = 0;
-               ret->i_blksize = PAGE_CACHE_SIZE;
                ret->i_blocks = 0;
                ret->i_atime = ret->i_mtime = ret->i_ctime = CURRENT_TIME;
        }
@@ -174,7 +174,7 @@ static struct dentry *ibmasmfs_create_file (struct super_block *sb,
        }
 
        inode->i_fop = fops;
-       inode->u.generic_ip = data;
+       inode->i_private = data;
 
        d_add(dentry, inode);
        return dentry;
@@ -243,7 +243,7 @@ static int command_file_open(struct inode *inode, struct file *file)
 {
        struct ibmasmfs_command_data *command_data;
 
-       if (!inode->u.generic_ip)
+       if (!inode->i_private)
                return -ENODEV;
 
        command_data = kmalloc(sizeof(struct ibmasmfs_command_data), GFP_KERNEL);
@@ -251,7 +251,7 @@ static int command_file_open(struct inode *inode, struct file *file)
                return -ENOMEM;
 
        command_data->command = NULL;
-       command_data->sp = inode->u.generic_ip;
+       command_data->sp = inode->i_private;
        file->private_data = command_data;
        return 0;
 }
@@ -350,10 +350,10 @@ static int event_file_open(struct inode *inode, struct file *file)
        struct ibmasmfs_event_data *event_data;
        struct service_processor *sp; 
 
-       if (!inode->u.generic_ip)
+       if (!inode->i_private)
                return -ENODEV;
 
-       sp = inode->u.generic_ip;
+       sp = inode->i_private;
 
        event_data = kmalloc(sizeof(struct ibmasmfs_event_data), GFP_KERNEL);
        if (!event_data)
@@ -438,14 +438,14 @@ static int r_heartbeat_file_open(struct inode *inode, struct file *file)
 {
        struct ibmasmfs_heartbeat_data *rhbeat;
 
-       if (!inode->u.generic_ip)
+       if (!inode->i_private)
                return -ENODEV;
 
        rhbeat = kmalloc(sizeof(struct ibmasmfs_heartbeat_data), GFP_KERNEL);
        if (!rhbeat)
                return -ENOMEM;
 
-       rhbeat->sp = (struct service_processor *)inode->u.generic_ip;
+       rhbeat->sp = inode->i_private;
        rhbeat->active = 0;
        ibmasm_init_reverse_heartbeat(rhbeat->sp, &rhbeat->heartbeat);
        file->private_data = rhbeat;
@@ -507,7 +507,7 @@ static ssize_t r_heartbeat_file_write(struct file *file, const char __user *buf,
 
 static int remote_settings_file_open(struct inode *inode, struct file *file)
 {
-       file->private_data = inode->u.generic_ip;
+       file->private_data = inode->i_private;
        return 0;
 }