patch-2.1.132 linux/drivers/scsi/aic7xxx_proc.c

Next file: linux/drivers/scsi/atp870u.c
Previous file: linux/drivers/scsi/aic7xxx.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.131/linux/drivers/scsi/aic7xxx_proc.c linux/drivers/scsi/aic7xxx_proc.c
@@ -132,7 +132,7 @@
   {
     for (lun = 0; lun < MAX_LUNS; lun++)
     {
-      if (p->stats[target][lun].xfers != 0)
+      if (p->stats[target][lun].r_total != 0)
 #ifdef AIC7XXX_PROC_STATS
         size += 512;
 #else
@@ -278,7 +278,7 @@
     for (lun = 0; lun < MAX_LUNS; lun++)
     {
       sp = &p->stats[target][lun];
-      if (sp->xfers == 0)
+      if (sp->r_total == 0)
       {
         continue;
       }
@@ -331,11 +331,11 @@
                       p->transinfo[target].cur_period,
                       p->transinfo[target].cur_offset,
                       p->transinfo[target].cur_width);
+#ifdef AIC7XXX_PROC_STATS
       size += sprintf(BLS, "    Total transfers %ld (%ld read;%ld written)\n",
           sp->xfers, sp->r_total, sp->w_total);
       size += sprintf(BLS, "      blks(512) rd=%ld; blks(512) wr=%ld\n",
           sp->r_total512, sp->w_total512);
-#ifdef AIC7XXX_PROC_STATS
       size += sprintf(BLS, "%s\n", HDRB);
       size += sprintf(BLS, " Reads:");
       for (i = 0; i < NUMBER(sp->r_bins); i++)
@@ -348,6 +348,9 @@
       {
         size += sprintf(BLS, "%6ld ", sp->w_bins[i]);
       }
+#else
+      size += sprintf(BLS, "    Total transfers: %ld/%ld read/written)\n",
+          sp->r_total, sp->w_total);
 #endif /* AIC7XXX_PROC_STATS */
       size += sprintf(BLS, "\n\n");
     }

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov