[PATCH] move memory_read_from_buffer() from fs.h to string.h

[PATCH] move memory_read_from_buffer() from fs.h to string.h

[Akinobu Mita]

On Fri, Jul 04, 2008 at 09:42:35AM -0500, James Bottomley wrote:
> For such a micro optimisation, this is a pretty big price to pay.
> 
> Inclusion of linux/fs.h in a low level driver was always a danger signal
> usually it meant the driver was trying to access files or something at
> the very least it was a warning of a potential layering violation.  Now
> you're trying to make it standard practice ... I really don't like that.
> Surely a function that does memory to memory copies belongs either in
> string.h with the rest of our memory copies ... or in another header
> that would be a usual include for the potential users.

OK, I'll move it to linux/string.h

From: Akinobu Mita <akinobu.mita@gmail.com>
Subject: [PATCH] move memory_read_from_buffer() from fs.h to string.h

James Bottomley warns that inclusion of linux/fs.h in a low level driver
was always a danger signal. This patch moves memory_read_from_buffer()
from fs.h to string.h and fixes includes in existing memory_read_from_buffer()
users.

Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Cc: James Bottomley <James.Bottomley@hansenpartnership.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Zhang Rui <rui.zhang@intel.com>
Cc: Bob Moore <robert.moore@intel.com>
Cc: Thomas Renninger <trenn@suse.de>
Cc: Len Brown <lenb@kernel.org>
---
 drivers/acpi/system.c       |    1 +
 drivers/zorro/zorro-sysfs.c |    1 -
 include/linux/fs.h          |    2 --
 include/linux/string.h      |    3 +++
 4 files changed, 4 insertions(+), 3 deletions(-)

Index: 2.6-mm/include/linux/fs.h
===================================================================
--- 2.6-mm.orig/include/linux/fs.h
+++ 2.6-mm/include/linux/fs.h
@@ -2026,8 +2026,6 @@ extern void simple_release_fs(struct vfs
 
 extern ssize_t simple_read_from_buffer(void __user *to, size_t count,
 			loff_t *ppos, const void *from, size_t available);
-extern ssize_t memory_read_from_buffer(void *to, size_t count, loff_t *ppos,
-			const void *from, size_t available);
 
 #ifdef CONFIG_MIGRATION
 extern int buffer_migrate_page(struct address_space *,
Index: 2.6-mm/include/linux/string.h
===================================================================
--- 2.6-mm.orig/include/linux/string.h
+++ 2.6-mm/include/linux/string.h
@@ -111,5 +111,8 @@ extern void argv_free(char **argv);
 
 extern bool sysfs_streq(const char *s1, const char *s2);
 
+extern ssize_t memory_read_from_buffer(void *to, size_t count, loff_t *ppos,
+			const void *from, size_t available);
+
 #endif
 #endif /* _LINUX_STRING_H_ */
Index: 2.6-mm/drivers/acpi/system.c
===================================================================
--- 2.6-mm.orig/drivers/acpi/system.c
+++ 2.6-mm/drivers/acpi/system.c
@@ -26,6 +26,7 @@
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 #include <linux/init.h>
+#include <linux/string.h>
 #include <asm/uaccess.h>
 
 #include <acpi/acpi_drivers.h>
Index: 2.6-mm/drivers/zorro/zorro-sysfs.c
===================================================================
--- 2.6-mm.orig/drivers/zorro/zorro-sysfs.c
+++ 2.6-mm/drivers/zorro/zorro-sysfs.c
@@ -15,7 +15,6 @@
 #include <linux/zorro.h>
 #include <linux/stat.h>
 #include <linux/string.h>
-#include <linux/fs.h>
 
 #include "zorro.h"
 

[PATCH -mm] fix s390-use-memory_read_from_buffer.patch

[Akinobu Mita]

Now memory_read_from_buffer() belongs in string.h

Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Michael Holzheu <holzheu@de.ibm.com>
---
 arch/s390/kernel/ipl.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: 2.6-mm/arch/s390/kernel/ipl.c
===================================================================
--- 2.6-mm.orig/arch/s390/kernel/ipl.c
+++ 2.6-mm/arch/s390/kernel/ipl.c
@@ -14,7 +14,7 @@
 #include <linux/delay.h>
 #include <linux/reboot.h>
 #include <linux/ctype.h>
-#include <linux/fs.h>
+#include <linux/string.h>
 #include <asm/ipl.h>
 #include <asm/smp.h>
 #include <asm/setup.h>

[PATCH -mm] fix s390-cio-use-memory_read_from_buffer.patch

[Akinobu Mita]

Now memory_read_from_buffer() belongs in string.h

Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Peter Oberparleiter <peter.oberparleiter@de.ibm.com>
---
 drivers/s390/cio/chp.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: 2.6-mm/drivers/s390/cio/chp.c
===================================================================
--- 2.6-mm.orig/drivers/s390/cio/chp.c
+++ 2.6-mm/drivers/s390/cio/chp.c
@@ -15,7 +15,7 @@
 #include <linux/wait.h>
 #include <linux/mutex.h>
 #include <linux/errno.h>
-#include <linux/fs.h>
+#include <linux/string.h>
 #include <asm/chpid.h>
 #include <asm/sclp.h>
 

[PATCH -mm] fix qla2xxx-use-memory_read_from_buffer.patch

[Akinobu Mita]

Now memory_read_from_buffer() belongs in string.h

Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Cc: Andrew Vasquez <linux-driver@qlogic.com>
Cc: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
Cc: Andrew Vasquez <andrew.vasquez@qlogic.com>
Cc: Seokmann Ju <seokmann.ju@qlogic.com>
---
 drivers/scsi/qla2xxx/qla_attr.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: 2.6-mm/drivers/scsi/qla2xxx/qla_attr.c
===================================================================
--- 2.6-mm.orig/drivers/scsi/qla2xxx/qla_attr.c
+++ 2.6-mm/drivers/scsi/qla2xxx/qla_attr.c
@@ -8,7 +8,7 @@
 
 #include <linux/kthread.h>
 #include <linux/vmalloc.h>
-#include <linux/fs.h>
+#include <linux/string.h>
 
 static int qla24xx_vport_disable(struct fc_vport *, bool);
 

[PATCH -mm] fix ipr-use-memory_read_from_buffer.patch

[Akinobu Mita]

Now memory_read_from_buffer() belongs in string.h

Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Cc: Brian King <brking@us.ibm.com>
Cc: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
---
 drivers/scsi/ipr.c |    1 +
 1 file changed, 1 insertion(+)

Index: 2.6-mm/drivers/scsi/ipr.c
===================================================================
--- 2.6-mm.orig/drivers/scsi/ipr.c
+++ 2.6-mm/drivers/scsi/ipr.c
@@ -71,6 +71,7 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/libata.h>
+#include <linux/string.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/processor.h>

[PATCH -mm] fix dcdbas-use-memory_read_from_buffer.patch

[Akinobu Mita]

Now memory_read_from_buffer() belongs in string.h

Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Cc: Doug Warzecha <Douglas_Warzecha@dell.com>
Cc: Zhang Rui <rui.zhang@intel.com>
Cc: Matt Domsch <Matt_Domsch@dell.com>
---
 drivers/firmware/dcdbas.c |    1 -
 1 file changed, 1 deletion(-)

Index: 2.6-mm/drivers/firmware/dcdbas.c
===================================================================
--- 2.6-mm.orig/drivers/firmware/dcdbas.c
+++ 2.6-mm/drivers/firmware/dcdbas.c
@@ -34,7 +34,6 @@
 #include <linux/string.h>
 #include <linux/types.h>
 #include <linux/mutex.h>
-#include <linux/fs.h>
 #include <asm/io.h>
 
 #include "dcdbas.h"

[PATCH -mm] fix aty-use-memory_read_from_buffer.patch

[Akinobu Mita]

Now memory_read_from_buffer() belongs in string.h

Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Cc: Krzysztof Helt <krzysztof.h1@poczta.fm>
---
 drivers/video/aty/radeon_base.c |    1 -
 1 file changed, 1 deletion(-)

Index: 2.6-mm/drivers/video/aty/radeon_base.c
===================================================================
--- 2.6-mm.orig/drivers/video/aty/radeon_base.c
+++ 2.6-mm/drivers/video/aty/radeon_base.c
@@ -70,7 +70,6 @@
 #include <linux/pci.h>
 #include <linux/vmalloc.h>
 #include <linux/device.h>
-#include <linux/fs.h>
 
 #include <asm/io.h>
 #include <linux/uaccess.h>

[PATCH -mm] fix firmware-use-memory_read_from_buffer.patch

[Akinobu Mita]

Now memory_read_from_buffer() belongs in string.h

Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
Cc: Markus Rechberger <markus.rechberger@amd.com>
Cc: Kay Sievers <kay.sievers@vrfy.org>
---
 drivers/base/firmware_class.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: 2.6-mm/drivers/base/firmware_class.c
===================================================================
--- 2.6-mm.orig/drivers/base/firmware_class.c
+++ 2.6-mm/drivers/base/firmware_class.c
@@ -17,7 +17,7 @@
 #include <linux/bitops.h>
 #include <linux/mutex.h>
 #include <linux/kthread.h>
-#include <linux/fs.h>
+#include <linux/string.h>
 
 #include <linux/firmware.h>
 #include "base.h"

[PATCH -mm] fix dell_rbu-use-memory_read_from_buffer.patch

[Akinobu Mita]

Now memory_read_from_buffer() belongs in string.h

Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Cc: Abhay Salunke <Abhay_Salunke@dell.com>
Cc: Zhang Rui <rui.zhang@intel.com>
Cc: Matt Domsch <Matt_Domsch@dell.com>
---
 drivers/firmware/dell_rbu.c |    1 -
 1 file changed, 1 deletion(-)

Index: 2.6-mm/drivers/firmware/dell_rbu.c
===================================================================
--- 2.6-mm.orig/drivers/firmware/dell_rbu.c
+++ 2.6-mm/drivers/firmware/dell_rbu.c
@@ -44,7 +44,6 @@
 #include <linux/moduleparam.h>
 #include <linux/firmware.h>
 #include <linux/dma-mapping.h>
-#include <linux/fs.h>
 
 MODULE_AUTHOR("Abhay Salunke <abhay_salunke@dell.com>");
 MODULE_DESCRIPTION("Driver for updating BIOS image on DELL systems");

Re: [PATCH -mm] fix ipr-use-memory_read_from_buffer.patch

[James Bottomley]

On Sat, 2008-07-05 at 01:54 +0900, Akinobu Mita wrote:
> Now memory_read_from_buffer() belongs in string.h
> 
> Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
> Cc: Brian King <brking@us.ibm.com>
> Cc: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
> ---
>  drivers/scsi/ipr.c |    1 +
>  1 file changed, 1 insertion(+)
> 
> Index: 2.6-mm/drivers/scsi/ipr.c
> ===================================================================
> --- 2.6-mm.orig/drivers/scsi/ipr.c
> +++ 2.6-mm/drivers/scsi/ipr.c
> @@ -71,6 +71,7 @@
>  #include <linux/module.h>
>  #include <linux/moduleparam.h>
>  #include <linux/libata.h>
> +#include <linux/string.h>
>  #include <asm/io.h>
>  #include <asm/irq.h>
>  #include <asm/processor.h>

This isn't really necessary, is it?  As you can see from the file being
stuffed full of memcpy directives, it's already getting an implicit
include of string.h from somewhere (like the rest of the SCSI drivers).

James

Re: [PATCH -mm] fix ipr-use-memory_read_from_buffer.patch

[Akinobu Mita]

>> --- 2.6-mm.orig/drivers/scsi/ipr.c
>> +++ 2.6-mm/drivers/scsi/ipr.c
>> @@ -71,6 +71,7 @@
>>  #include <linux/module.h>
>>  #include <linux/moduleparam.h>
>>  #include <linux/libata.h>
>> +#include <linux/string.h>
>>  #include <asm/io.h>
>>  #include <asm/irq.h>
>>  #include <asm/processor.h>
>
> This isn't really necessary, is it?  As you can see from the file being
> stuffed full of memcpy directives, it's already getting an implicit
> include of string.h from somewhere (like the rest of the SCSI drivers).

Indeed. This is not necessary.