Merge branch 'master' into for_paulus

[linux-drm-fsl-dcu.git] / drivers / infiniband / hw / ipath / ipath_fs.c

diff --git a/drivers/infiniband/hw/ipath/ipath_fs.c b/drivers/infiniband/hw/ipath/ipath_fs.c
index 0936d8e8d7043bdc51408c5e4bdf9ba25d9bc54f..5b40a846ff95490f61b93ce4d6f7a08d821570fa 100644 (file)
--- a/drivers/infiniband/hw/ipath/ipath_fs.c
+++ b/drivers/infiniband/hw/ipath/ipath_fs.c
@@ -47,7 +47,7 @@
 static struct super_block *ipath_super;
 
 static int ipathfs_mknod(struct inode *dir, struct dentry *dentry,
-                        int mode, struct file_operations *fops,
+                        int mode, const struct file_operations *fops,
                         void *data)
 {
        int error;
@@ -61,14 +61,13 @@ static int ipathfs_mknod(struct inode *dir, struct dentry *dentry,
        inode->i_mode = mode;
        inode->i_uid = 0;
        inode->i_gid = 0;
-       inode->i_blksize = PAGE_CACHE_SIZE;
        inode->i_blocks = 0;
        inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
-       inode->u.generic_ip = data;
+       inode->i_private = data;
        if ((mode & S_IFMT) == S_IFDIR) {
                inode->i_op = &simple_dir_inode_operations;
-               inode->i_nlink++;
-               dir->i_nlink++;
+               inc_nlink(inode);
+               inc_nlink(dir);
        }
 
        inode->i_fop = fops;
@@ -82,7 +81,7 @@ bail:
 
 static int create_file(const char *name, mode_t mode,
                       struct dentry *parent, struct dentry **dentry,
-                      struct file_operations *fops, void *data)
+                      const struct file_operations *fops, void *data)
 {
        int error;
 
@@ -106,7 +105,7 @@ static ssize_t atomic_stats_read(struct file *file, char __user *buf,
                                       sizeof ipath_stats);
 }
 
-static struct file_operations atomic_stats_ops = {
+static const struct file_operations atomic_stats_ops = {
        .read = atomic_stats_read,
 };
 
@@ -119,7 +118,7 @@ static ssize_t atomic_counters_read(struct file *file, char __user *buf,
        u16 i;
        struct ipath_devdata *dd;
 
-       dd = file->f_dentry->d_inode->u.generic_ip;
+       dd = file->f_path.dentry->d_inode->i_private;
 
        for (i = 0; i < NUM_COUNTERS; i++)
                counters[i] = ipath_snap_cntr(dd, i);
@@ -128,7 +127,7 @@ static ssize_t atomic_counters_read(struct file *file, char __user *buf,
                                       sizeof counters);
 }
 
-static struct file_operations atomic_counters_ops = {
+static const struct file_operations atomic_counters_ops = {
        .read = atomic_counters_read,
 };
 
@@ -139,7 +138,7 @@ static ssize_t atomic_node_info_read(struct file *file, char __user *buf,
        struct ipath_devdata *dd;
        u64 guid;
 
-       dd = file->f_dentry->d_inode->u.generic_ip;
+       dd = file->f_path.dentry->d_inode->i_private;
 
        guid = be64_to_cpu(dd->ipath_guid);
 
@@ -167,7 +166,7 @@ static ssize_t atomic_node_info_read(struct file *file, char __user *buf,
                                       sizeof nodeinfo);
 }
 
-static struct file_operations atomic_node_info_ops = {
+static const struct file_operations atomic_node_info_ops = {
        .read = atomic_node_info_read,
 };
 
@@ -178,7 +177,7 @@ static ssize_t atomic_port_info_read(struct file *file, char __user *buf,
        u32 tmp, tmp2;
        struct ipath_devdata *dd;
 
-       dd = file->f_dentry->d_inode->u.generic_ip;
+       dd = file->f_path.dentry->d_inode->i_private;
 
        /* so we only initialize non-zero fields. */
        memset(portinfo, 0, sizeof portinfo);
@@ -191,8 +190,8 @@ static ssize_t atomic_port_info_read(struct file *file, char __user *buf,
        portinfo[4] = (dd->ipath_lid << 16);
 
        /*
-        * Notimpl yet SMLID (should we store this in the driver, in case
-        * SMA dies?)  CapabilityMask is 0, we don't support any of these
+        * Notimpl yet SMLID.
+        * CapabilityMask is 0, we don't support any of these
         * DiagCode is 0; we don't store any diag info for now Notimpl yet
         * M_KeyLeasePeriod (we don't support M_Key)
         */
@@ -292,7 +291,7 @@ static ssize_t atomic_port_info_read(struct file *file, char __user *buf,
                                       sizeof portinfo);
 }
 
-static struct file_operations atomic_port_info_ops = {
+static const struct file_operations atomic_port_info_ops = {
        .read = atomic_port_info_read,
 };
 
@@ -325,7 +324,7 @@ static ssize_t flash_read(struct file *file, char __user *buf,
                goto bail;
        }
 
-       dd = file->f_dentry->d_inode->u.generic_ip;
+       dd = file->f_path.dentry->d_inode->i_private;
        if (ipath_eeprom_read(dd, pos, tmp, count)) {
                ipath_dev_err(dd, "failed to read from flash\n");
                ret = -ENXIO;
@@ -357,19 +356,16 @@ static ssize_t flash_write(struct file *file, const char __user *buf,
 
        pos = *ppos;
 
-       if ( pos < 0) {
+       if (pos != 0) {
                ret = -EINVAL;
                goto bail;
        }
 
-       if (pos >= sizeof(struct ipath_flash)) {
-               ret = 0;
+       if (count != sizeof(struct ipath_flash)) {
+               ret = -EINVAL;
                goto bail;
        }
 
-       if (count > sizeof(struct ipath_flash) - pos)
-               count = sizeof(struct ipath_flash) - pos;
-
        tmp = kmalloc(count, GFP_KERNEL);
        if (!tmp) {
                ret = -ENOMEM;
@@ -381,7 +377,7 @@ static ssize_t flash_write(struct file *file, const char __user *buf,
                goto bail_tmp;
        }
 
-       dd = file->f_dentry->d_inode->u.generic_ip;
+       dd = file->f_path.dentry->d_inode->i_private;
        if (ipath_eeprom_write(dd, pos, tmp, count)) {
                ret = -ENXIO;
                ipath_dev_err(dd, "failed to write to flash\n");
@@ -398,7 +394,7 @@ bail:
        return ret;
 }
 
-static struct file_operations flash_ops = {
+static const struct file_operations flash_ops = {
        .read = flash_read,
        .write = flash_write,
 };