git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
[pandora-kernel.git]
/
drivers
/
infiniband
/
ulp
/
ipoib
/
ipoib_fs.c
diff --git
a/drivers/infiniband/ulp/ipoib/ipoib_fs.c
b/drivers/infiniband/ulp/ipoib/ipoib_fs.c
index
5dde380
..
44c1741
100644
(file)
--- a/
drivers/infiniband/ulp/ipoib/ipoib_fs.c
+++ b/
drivers/infiniband/ulp/ipoib/ipoib_fs.c
@@
-141,12
+141,12
@@
static int ipoib_mcg_open(struct inode *inode, struct file *file)
return ret;
seq = file->private_data;
return ret;
seq = file->private_data;
- seq->private = inode->
u.generic_ip
;
+ seq->private = inode->
i_private
;
return 0;
}
return 0;
}
-static struct file_operations ipoib_mcg_fops = {
+static
const
struct file_operations ipoib_mcg_fops = {
.owner = THIS_MODULE,
.open = ipoib_mcg_open,
.read = seq_read,
.owner = THIS_MODULE,
.open = ipoib_mcg_open,
.read = seq_read,
@@
-247,12
+247,12
@@
static int ipoib_path_open(struct inode *inode, struct file *file)
return ret;
seq = file->private_data;
return ret;
seq = file->private_data;
- seq->private = inode->
u.generic_ip
;
+ seq->private = inode->
i_private
;
return 0;
}
return 0;
}
-static struct file_operations ipoib_path_fops = {
+static
const
struct file_operations ipoib_path_fops = {
.owner = THIS_MODULE,
.open = ipoib_path_open,
.read = seq_read,
.owner = THIS_MODULE,
.open = ipoib_path_open,
.read = seq_read,