Skip to contentSkip to conversation

s390: cio max channels checks.

PATCH In review Martin Schwidefsky 2 participants 3 messages Jun 1, 2005 – Jun 3, 2005

Subsystems (2)
s390 s390 common I/O layer
lore
Share & tools
lore

Martin Schwidefsky

author
#0 lore raw

PATCH 1/11 s390: cio max channels checks.

[patch 1/11] s390: cio max channels checks.

From: Cornelia Huck <[email protected]>

Fix max channel check in cio_ignore display function.

Signed-off-by Martin Schwidefsky <[email protected]>

diffstat:

 drivers/s390/cio/blacklist.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
drivers/s390/cio/blacklist.c +3 -3
diff -urpN linux-2.6/drivers/s390/cio/blacklist.c linux-2.6-patched/drivers/s390/cio/blacklist.c
@@ -1,7 +1,7 @@
 /*
  *  drivers/s390/cio/blacklist.c
  *   S/390 common I/O routines -- blacklisting of specific devices
- *   $Revision: 1.33 $
+ *   $Revision: 1.34 $
  *
  *    Copyright (C) 1999-2002 IBM Deutschland Entwicklung GmbH,
  *			      IBM Corporation

@@ -289,7 +289,7 @@ static int cio_ignore_read (char *page, 
 	len = 0;
 	for (devno = off; /* abuse the page variable
 			   * as counter, see fs/proc/generic.c */
-	     devno <= __MAX_SUBCHANNELS && len + entry_size < count; devno++) {
+	     devno < __MAX_SUBCHANNELS && len + entry_size < count; devno++) {
 		if (!test_bit(devno, bl_dev))
 			continue;
 		len += sprintf(page + len, "0.0.%04lx", devno);

@@ -302,7 +302,7 @@ static int cio_ignore_read (char *page, 
 		len += sprintf(page + len, "\n");
 	}
 
-	if (devno <= __MAX_SUBCHANNELS)
+	if (devno < __MAX_SUBCHANNELS)
 		*eof = 1;
 	*start = (char *) (devno - off); /* number of checked entries */
 	return len;
#1 lore raw
Quoted 2 lines · Martin Schwidefsky

[patch 1/11] s390: cio max channels checks.

Which of these patches are considered to be 2.6.12 material?

author
#2 lore raw
Quoted 3 lines
Quoted 1 line

[patch 1/11] s390: cio max channels checks.

Which of these patches are considered to be 2.6.12 material?

All the patches are pretty short but if I had to choose I'd say at least the following 4 patches should go into 2.6.12:

[patch 3/11] s390: ptrace peek and poke. [patch 4/11] s390: uml ptrace fixes. [patch 6/11] s390: in_interrupt vs. in_atomic. [patch 9/11] s390: deadlock in appldata.

blue skies,
Martin

Martin Schwidefsky
Linux for zSeries Development & Services IBM Deutschland Entwicklung GmbH