Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit deee13df authored by Kai Makisara's avatar Kai Makisara Committed by James Bottomley
Browse files

[SCSI] st: compile fix when DEBUG set to one 



Remove the now useless counting of adjacent pages from the debugging code in
to make it compile when DEBUG is set non-zero.

Signed-off-by: default avatarKai Makisara <kai.makisara@kolumbus.fi>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent c9872fe1

drivers/scsi/st.c

+4 −7
Original line number Original line Diff line number Diff line
@@ -17,7 +17,7 @@ 
   Last modified: 18-JAN-1998 Richard Gooch <rgooch@atnf.csiro.au> Devfs support

   Last modified: 18-JAN-1998 Richard Gooch <rgooch@atnf.csiro.au> Devfs support

 */

 */





static const char *verstr = "20080117";

static const char *verstr = "20080221";





#include <linux/module.h>

#include <linux/module.h>
@@ -1172,7 +1172,7 @@ static int st_open(struct inode *inode, struct file *filp) 
	STp->try_dio_now = STp->try_dio;

	STp->try_dio_now = STp->try_dio;

	STp->recover_count = 0;

	STp->recover_count = 0;

	DEB( STp->nbr_waits = STp->nbr_finished = 0;

	DEB( STp->nbr_waits = STp->nbr_finished = 0;

	     STp->nbr_requests = STp->nbr_dio = STp->nbr_pages = STp->nbr_combinable = 0; )

	     STp->nbr_requests = STp->nbr_dio = STp->nbr_pages = 0; )





	retval = check_tape(STp, filp);

	retval = check_tape(STp, filp);

	if (retval < 0)

	if (retval < 0)
@@ -1226,8 +1226,8 @@ static int st_flush(struct file *filp, fl_owner_t id) 
	}

	}





	DEBC( if (STp->nbr_requests)

	DEBC( if (STp->nbr_requests)

		printk(KERN_DEBUG "%s: Number of r/w requests %d, dio used in %d, pages %d (%d).\n",

		printk(KERN_DEBUG "%s: Number of r/w requests %d, dio used in %d, pages %d.\n",

		       name, STp->nbr_requests, STp->nbr_dio, STp->nbr_pages, STp->nbr_combinable));

		       name, STp->nbr_requests, STp->nbr_dio, STp->nbr_pages));





	if (STps->rw == ST_WRITING && !STp->pos_unknown) {

	if (STps->rw == ST_WRITING && !STp->pos_unknown) {

		struct st_cmdstatus *cmdstatp = &STp->buffer->cmdstat;

		struct st_cmdstatus *cmdstatp = &STp->buffer->cmdstat;
@@ -1422,9 +1422,6 @@ static int setup_buffering(struct scsi_tape *STp, const char __user *buf, 
		     if (STbp->do_dio) {

		     if (STbp->do_dio) {

			STp->nbr_dio++;

			STp->nbr_dio++;

			STp->nbr_pages += STbp->do_dio;

			STp->nbr_pages += STbp->do_dio;

			for (i=1; i < STbp->do_dio; i++)

				if (page_to_pfn(STbp->sg[i].page) == page_to_pfn(STbp->sg[i-1].page) + 1)

					STp->nbr_combinable++;

		     }

		     }

		)

		)

	} else

	} else

drivers/scsi/st.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -164,7 +164,6 @@ struct scsi_tape { 
	int nbr_requests;

	int nbr_requests;

	int nbr_dio;

	int nbr_dio;

	int nbr_pages;

	int nbr_pages;

	int nbr_combinable;

	unsigned char last_cmnd[6];

	unsigned char last_cmnd[6];

	unsigned char last_sense[16];

	unsigned char last_sense[16];

#endif

#endif