From 86c0bad77a859f50bfa008160c278e748fd2c9eb Mon Sep 17 00:00:00 2001
From: Kyle McMartin <kyle@redhat.com>
Date: Mar 30 2011 16:13:45 +0000
Subject: drop scsi sd printks about caching from error to notice


---

diff --git a/kernel.spec b/kernel.spec
index 98cbfe9..5ec21a5 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -51,7 +51,7 @@ Summary: The Linux kernel
 # For non-released -rc kernels, this will be prepended with "0.", so
 # for example a 3 here will become 0.3
 #
-%global baserelease 8
+%global baserelease 9
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -731,6 +731,7 @@ Patch12207: pci-pcie-links-may-not-get-configured-for-aspm-under-powersave-mode.
 Patch12303: dmar-disable-when-ricoh-multifunction.patch
 
 Patch12305: printk-do-not-mangle-valid-userspace-syslog-prefixes.patch
+Patch12306: scsi-sd-downgrade-caching-printk-from-error-to-notice.patch
 
 %endif
 
@@ -1361,6 +1362,8 @@ ApplyPatch dmar-disable-when-ricoh-multifunction.patch
 # rhbz#691888
 ApplyPatch printk-do-not-mangle-valid-userspace-syslog-prefixes.patch
 
+ApplyPatch scsi-sd-downgrade-caching-printk-from-error-to-notice.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1969,6 +1972,12 @@ fi
 # and build.
 
 %changelog
+* Wed Mar 29 2011 Kyle McMartin <kmcmartin@redhat.com> 2.6.38.2-9
+- Downgrade SCSI sd printk's about disk caching from KERN_ERR to KERN_NOTICE
+  so they don't show up in our pretty quiet boot. Ray noticed them when
+  booting from a USB stick which doesn't have a cache page returned in the
+  sense buffer.
+
 * Tue Mar 29 2011 Kyle McMartin <kmcmartin@redhat.com>
 - Disable CONFIG_IMA, CONFIG_TCG_TPM on powerpc (#689468)
 
diff --git a/scsi-sd-downgrade-caching-printk-from-error-to-notice.patch b/scsi-sd-downgrade-caching-printk-from-error-to-notice.patch
new file mode 100644
index 0000000..47ebbad
--- /dev/null
+++ b/scsi-sd-downgrade-caching-printk-from-error-to-notice.patch
@@ -0,0 +1,27 @@
+diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
+index e567302..261638a 100644
+--- a/drivers/scsi/sd.c
++++ b/drivers/scsi/sd.c
+@@ -1988,11 +1988,11 @@ sd_read_cache_type(struct scsi_disk *sdkp, unsigned char *buffer)
+ 		}
+ 
+ 		if (modepage == 0x3F) {
+-			sd_printk(KERN_ERR, sdkp, "No Caching mode page "
++			sd_printk(KERN_NOTICE, sdkp, "No Caching mode page "
+ 				  "present\n");
+ 			goto defaults;
+ 		} else if ((buffer[offset] & 0x3f) != modepage) {
+-			sd_printk(KERN_ERR, sdkp, "Got wrong page\n");
++			sd_printk(KERN_NOTICE, sdkp, "Got wrong page\n");
+ 			goto defaults;
+ 		}
+ 	Page_found:
+@@ -2033,7 +2033,7 @@ bad_sense:
+ 		sd_printk(KERN_ERR, sdkp, "Asking for cache data failed\n");
+ 
+ defaults:
+-	sd_printk(KERN_ERR, sdkp, "Assuming drive cache: write through\n");
++	sd_printk(KERN_NOTICE, sdkp, "Assuming drive cache: write through\n");
+ 	sdkp->WCE = 0;
+ 	sdkp->RCD = 0;
+ 	sdkp->DPOFUA = 0;