On Fri, 2006-10-20 at 11:44 -0700, Robert Walsh wrote: > > Of note is that both ipath and ipoib modules required minor tweaks to > > work with the inode-diet patch set which could effect their operation (I > > suspect the patch is correct, but haven't tested it). > > Can you send a patch for this, please?
The attached patch addresses an update to our iscsi lib that required a
one line change, and the update for the inode diet patch.
--
Doug Ledford <[EMAIL PROTECTED]>
GPG KeyID: CFBFF194
http://people.redhat.com/dledford
Infiniband specific RPMs available at
http://people.redhat.com/dledford/Infiniband
--- openib-1.1/drivers/infiniband/hw/ipath/ipath_fs.c.inode 2006-10-19 23:28:14.000000000 -0400
+++ openib-1.1/drivers/infiniband/hw/ipath/ipath_fs.c 2006-10-19 23:28:17.000000000 -0400
@@ -66,10 +66,9 @@ static int ipathfs_mknod(struct inode *d
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++;
@@ -132,7 +131,7 @@ static ssize_t atomic_counters_read(stru
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);
@@ -152,7 +151,7 @@ static ssize_t atomic_node_info_read(str
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);
@@ -191,7 +190,7 @@ static ssize_t atomic_port_info_read(str
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);
@@ -338,7 +337,7 @@ static ssize_t flash_read(struct file *f
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;
@@ -394,7 +393,7 @@ static ssize_t flash_write(struct file *
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");
--- openib-1.1/drivers/infiniband/ulp/iser/iscsi_iser.c.iscsi 2006-10-20 01:03:33.000000000 -0400
+++ openib-1.1/drivers/infiniband/ulp/iser/iscsi_iser.c 2006-10-20 01:03:49.000000000 -0400
@@ -200,8 +200,7 @@ iscsi_iser_ctask_xmit_unsol_data(struct
/* Send data-out PDUs while there's still unsolicited data to send */
while (ctask->unsol_count > 0) {
- iscsi_prep_unsolicit_data_pdu(ctask, &hdr,
- iser_ctask->rdma_data_count);
+ iscsi_prep_unsolicit_data_pdu(ctask, &hdr);
debug_scsi("Sending data-out: itt 0x%x, data count %d\n",
hdr.itt, ctask->data_count);
--- linux-2.6.18.x86_64/drivers/infiniband/ulp/ipoib/ipoib_fs.c.inode 2006-10-20 00:50:14.000000000 -0400
+++ linux-2.6.18.x86_64/drivers/infiniband/ulp/ipoib/ipoib_fs.c 2006-10-20 00:52:50.000000000 -0400
@@ -141,7 +141,7 @@ static int ipoib_mcg_open(struct inode *
return ret;
seq = file->private_data;
- seq->private = inode->u.generic_ip;
+ seq->private = inode->i_private;
return 0;
}
@@ -247,7 +247,7 @@ static int ipoib_path_open(struct inode
return ret;
seq = file->private_data;
- seq->private = inode->u.generic_ip;
+ seq->private = inode->i_private;
return 0;
}
signature.asc
Description: This is a digitally signed message part
_______________________________________________ openib-general mailing list [email protected] http://openib.org/mailman/listinfo/openib-general To unsubscribe, please visit http://openib.org/mailman/listinfo/openib-general
