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
fedora core 6 1.2949 + vserver 2.2.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
ebbaf9c
..
79a60f0
100644
(file)
--- a/
drivers/infiniband/hw/ipath/ipath_fs.c
+++ b/
drivers/infiniband/hw/ipath/ipath_fs.c
@@
-66,8
+66,8
@@
static int ipathfs_mknod(struct inode *dir, struct dentry *dentry,
inode->i_private = data;
if ((mode & S_IFMT) == S_IFDIR) {
inode->i_op = &simple_dir_inode_operations;
inode->i_private = data;
if ((mode & S_IFMT) == S_IFDIR) {
inode->i_op = &simple_dir_inode_operations;
- in
ode->i_nlink++
;
-
dir->i_nlink++
;
+ in
c_nlink(inode)
;
+
inc_nlink(dir)
;
}
inode->i_fop = fops;
}
inode->i_fop = fops;
@@
-118,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->i_private;
+ dd = file->f_
path.
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);
@@
-138,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->i_private;
+ dd = file->f_
path.
dentry->d_inode->i_private;
guid = be64_to_cpu(dd->ipath_guid);
guid = be64_to_cpu(dd->ipath_guid);
@@
-177,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->i_private;
+ dd = file->f_
path.
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);
@@
-190,8
+190,8
@@
static ssize_t atomic_port_info_read(struct file *file, char __user *buf,
portinfo[4] = (dd->ipath_lid << 16);
/*
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)
*/
* DiagCode is 0; we don't store any diag info for now Notimpl yet
* M_KeyLeasePeriod (we don't support M_Key)
*/
@@
-324,7
+324,7
@@
static ssize_t flash_read(struct file *file, char __user *buf,
goto bail;
}
goto bail;
}
- dd = file->f_dentry->d_inode->i_private;
+ 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;
if (ipath_eeprom_read(dd, pos, tmp, count)) {
ipath_dev_err(dd, "failed to read from flash\n");
ret = -ENXIO;
@@
-356,19
+356,16
@@
static ssize_t flash_write(struct file *file, const char __user *buf,
pos = *ppos;
pos = *ppos;
- if (
pos <
0) {
+ if (
pos !=
0) {
ret = -EINVAL;
goto bail;
}
ret = -EINVAL;
goto bail;
}
- if (
pos >
= sizeof(struct ipath_flash)) {
- ret =
0
;
+ if (
count !
= sizeof(struct ipath_flash)) {
+ ret =
-EINVAL
;
goto bail;
}
goto bail;
}
- if (count > sizeof(struct ipath_flash) - pos)
- count = sizeof(struct ipath_flash) - pos;
-
tmp = kmalloc(count, GFP_KERNEL);
if (!tmp) {
ret = -ENOMEM;
tmp = kmalloc(count, GFP_KERNEL);
if (!tmp) {
ret = -ENOMEM;
@@
-380,7
+377,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->i_private;
+ 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");
if (ipath_eeprom_write(dd, pos, tmp, count)) {
ret = -ENXIO;
ipath_dev_err(dd, "failed to write to flash\n");