rpms/kernel/FC-4 linux-2.6-scsi-noisy-ioctl.patch, NONE, 1.1 kernel-2.6.spec, 1.1666, 1.1667

[fedora-cvs-commits redhat com]

Author: davej

Update of /cvs/dist/rpms/kernel/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv18372

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-scsi-noisy-ioctl.patch 
Log Message:
* Sat Jul 29 2006 Dave Jones <davej redhat com>
- Silence noisy SCSI ioctl. (#200638)


linux-2.6-scsi-noisy-ioctl.patch:
 scsi_ioctl.c |    5 +----
 1 files changed, 1 insertion(+), 4 deletions(-)

--- NEW FILE linux-2.6-scsi-noisy-ioctl.patch ---
--- linux-2.6.17.noarch/drivers/scsi/scsi_ioctl.c~	2006-07-29 13:38:07.000000000 -0400
+++ linux-2.6.17.noarch/drivers/scsi/scsi_ioctl.c	2006-07-29 13:38:52.000000000 -0400
@@ -110,11 +110,8 @@ static int ioctl_internal_command(struct
 				       sshdr.asc, sshdr.ascq);
 			break;
 		case NOT_READY:	/* This happens if there is no disc in drive */
-			if (sdev->removable && (cmd[0] != TEST_UNIT_READY)) {
-				printk(KERN_INFO "Device not ready. Make sure"
-				       " there is a disc in the drive.\n");
+			if (sdev->removable)
 				break;
-			}
 		case UNIT_ATTENTION:
 			if (sdev->removable) {
 				sdev->changed = 1;


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1666
retrieving revision 1.1667
diff -u -r1.1666 -r1.1667
--- kernel-2.6.spec	29 Jul 2006 02:58:44 -0000	1.1666
+++ kernel-2.6.spec	29 Jul 2006 17:41:05 -0000	1.1667
@@ -285,6 +285,7 @@
 # SCSI bits.
 Patch1102: linux-2.6-scsi-advansys-pcitable.patch
 Patch1103: linux-2.6-iscsi-update-to-2-6-18-upstream.patch
+Patch1104: linux-2.6-scsi-noisy-ioctl.patch
 
 # NFS bits.
 Patch1200: linux-2.6-NFSD-non-null-getxattr.patch
@@ -598,6 +599,8 @@
 # iSCSI driver update that can be dropped when kernel is rebased
 # against a kernel that has the SCSI updates for 2.6.18
 %patch1103 -p1
+# Silence noisy SCSI ioctl.
+%patch1104 -p1
 
 #
 # Various upstream NFS/NFSD fixes.
@@ -1076,6 +1079,9 @@
 %endif
 
 %changelog
+* Sat Jul 29 2006 Dave Jones <davej redhat com>
+- Silence noisy SCSI ioctl. (#200638)
+
 * Fri Jul 28 2006 Dave Jones <davej redhat com> [2.6.17-1.2144_FC4]
 - 2.6.17.7