git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.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
e274120
..
ebbaf9c
100644
(file)
--- a/
drivers/infiniband/hw/ipath/ipath_fs.c
+++ b/
drivers/infiniband/hw/ipath/ipath_fs.c
@@
-1,4
+1,5
@@
/*
/*
+ * Copyright (c) 2006 QLogic, Inc. All rights reserved.
* Copyright (c) 2006 PathScale, Inc. All rights reserved.
*
* This software is available to you under a choice of one of two
* Copyright (c) 2006 PathScale, Inc. All rights reserved.
*
* This software is available to you under a choice of one of two
@@
-31,7
+32,6
@@
*/
#include <linux/version.h>
*/
#include <linux/version.h>
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/fs.h>
#include <linux/mount.h>
#include <linux/module.h>
#include <linux/fs.h>
#include <linux/mount.h>
@@
-61,10
+61,9
@@
static int ipathfs_mknod(struct inode *dir, struct dentry *dentry,
inode->i_mode = mode;
inode->i_uid = 0;
inode->i_gid = 0;
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->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++;
if ((mode & S_IFMT) == S_IFDIR) {
inode->i_op = &simple_dir_inode_operations;
inode->i_nlink++;
@@
-119,7
+118,7
@@
static ssize_t atomic_counters_read(struct file *file, char __user *buf,
u16 i;
struct ipath_devdata *dd;
u16 i;
struct ipath_devdata *dd;
- dd = file->f_dentry->d_inode->
u.generic_ip
;
+ dd = file->f_dentry->d_inode->
i_private
;
for (i = 0; i < NUM_COUNTERS; i++)
counters[i] = ipath_snap_cntr(dd, i);
for (i = 0; i < NUM_COUNTERS; i++)
counters[i] = ipath_snap_cntr(dd, i);
@@
-139,7
+138,7
@@
static ssize_t atomic_node_info_read(struct file *file, char __user *buf,
struct ipath_devdata *dd;
u64 guid;
struct ipath_devdata *dd;
u64 guid;
- dd = file->f_dentry->d_inode->
u.generic_ip
;
+ dd = file->f_dentry->d_inode->
i_private
;
guid = be64_to_cpu(dd->ipath_guid);
guid = be64_to_cpu(dd->ipath_guid);
@@
-178,7
+177,7
@@
static ssize_t atomic_port_info_read(struct file *file, char __user *buf,
u32 tmp, tmp2;
struct ipath_devdata *dd;
u32 tmp, tmp2;
struct ipath_devdata *dd;
- dd = file->f_dentry->d_inode->
u.generic_ip
;
+ dd = file->f_dentry->d_inode->
i_private
;
/* so we only initialize non-zero fields. */
memset(portinfo, 0, sizeof portinfo);
/* so we only initialize non-zero fields. */
memset(portinfo, 0, sizeof portinfo);
@@
-325,7
+324,7
@@
static ssize_t flash_read(struct file *file, char __user *buf,
goto bail;
}
goto bail;
}
- dd = file->f_dentry->d_inode->
u.generic_ip
;
+ dd = file->f_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;
if (ipath_eeprom_read(dd, pos, tmp, count)) {
ipath_dev_err(dd, "failed to read from flash\n");
ret = -ENXIO;
@@
-381,7
+380,7
@@
static ssize_t flash_write(struct file *file, const char __user *buf,
goto bail_tmp;
}
goto bail_tmp;
}
- dd = file->f_dentry->d_inode->
u.generic_ip
;
+ dd = file->f_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");
if (ipath_eeprom_write(dd, pos, tmp, count)) {
ret = -ENXIO;
ipath_dev_err(dd, "failed to write to flash\n");
@@
-542,13
+541,14
@@
bail:
return ret;
}
return ret;
}
-static struct super_block *ipathfs_get_sb(struct file_system_type *fs_type,
- int flags, const char *dev_name,
- void *data)
+static int ipathfs_get_sb(struct file_system_type *fs_type, int flags,
+ const char *dev_name, void *data, struct vfsmount *mnt)
{
{
- ipath_super = get_sb_single(fs_type, flags, data,
- ipathfs_fill_super);
- return ipath_super;
+ int ret = get_sb_single(fs_type, flags, data,
+ ipathfs_fill_super, mnt);
+ if (ret >= 0)
+ ipath_super = mnt->mnt_sb;
+ return ret;
}
static void ipathfs_kill_super(struct super_block *s)
}
static void ipathfs_kill_super(struct super_block *s)