[patch -mmotm 0/6] move memory_read_from_buffer() from fs.h to string.h

[patch -mmotm 0/6] move memory_read_from_buffer() from fs.h to string.h

[Akinobu Mita]

James Bottomley said 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 remove inclusion of linux/fs.h in existing
memory_read_from_buffer() users and -mm patches

[patch -mmotm 1/6] move memory_read_from_buffer() from fs.h to string.h

[Akinobu Mita]

[-- Attachment #1: move-memory-read-from-buffer-into-string-h.patch --]
[-- Type: text/plain, Size: 2667 bytes --]

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 remove inclusion of linux/fs.h in existing
memory_read_from_buffer() user.

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>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: linux390@de.ibm.com
Cc: linux-s390@vger.kernel.org
---
 arch/s390/kernel/ipl.c      |    1 -
 drivers/zorro/zorro-sysfs.c |    1 -
 include/linux/fs.h          |    2 --
 include/linux/string.h      |    3 +++
 4 files changed, 3 insertions(+), 4 deletions(-)

Index: 2.6-mmotm/include/linux/fs.h
===================================================================
--- 2.6-mmotm.orig/include/linux/fs.h
+++ 2.6-mmotm/include/linux/fs.h
@@ -2028,8 +2028,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-mmotm/include/linux/string.h
===================================================================
--- 2.6-mmotm.orig/include/linux/string.h
+++ 2.6-mmotm/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-mmotm/drivers/zorro/zorro-sysfs.c
===================================================================
--- 2.6-mmotm.orig/drivers/zorro/zorro-sysfs.c
+++ 2.6-mmotm/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"
 
Index: 2.6-mmotm/arch/s390/kernel/ipl.c
===================================================================
--- 2.6-mmotm.orig/arch/s390/kernel/ipl.c
+++ 2.6-mmotm/arch/s390/kernel/ipl.c
@@ -14,7 +14,6 @@
 #include <linux/delay.h>
 #include <linux/reboot.h>
 #include <linux/ctype.h>
-#include <linux/fs.h>
 #include <asm/ipl.h>
 #include <asm/smp.h>
 #include <asm/setup.h>

-- 

[patch -mmotm 2/6] fix qla2xxx-use-memory_read_from_buffer.patch

[Akinobu Mita]

[-- Attachment #1: qla2xxx-use-memory_read_from_buffer-fix.patch --]
[-- Type: text/plain, Size: 762 bytes --]

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 |    1 -
 1 file changed, 1 deletion(-)

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

-- 

Re: [patch -mmotm 2/6] fix qla2xxx-use-memory_read_from_buffer.patch

[Andrew Vasquez]

On Mon, 14 Jul 2008, Akinobu Mita wrote:

> 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>

If needed:

Acked-by: Andrew Vasquez <andrew.vasquez@qlogic.com>

BTW: is the memory_read_from_buffer() work for qla2xxx going in
through the mm tree submission path???

Re: [patch -mmotm 2/6] fix qla2xxx-use-memory_read_from_buffer.patch

[Andrew Morton]

On Thu, 17 Jul 2008 16:12:35 -0700
Andrew Vasquez <andrew.vasquez@qlogic.com> wrote:

> On Mon, 14 Jul 2008, Akinobu Mita wrote:
> 
> > 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>
> 
> If needed:
> 
> Acked-by: Andrew Vasquez <andrew.vasquez@qlogic.com>

Thanks. So we now have tested-by:you and acked-by:you.  That'll do ;)

> BTW: is the memory_read_from_buffer() work for qla2xxx going in
> through the mm tree submission path???

FSVO "through", yeah.  It's appeared on linux-scsi four times so far. 
Last time James complained about the fs.h inclusion so Akinobu raised a
patch "move memory_read_from_buffer() from fs.h to string.h" which I
just merged.

I'll just keep pressing send - it'll get there sometime.  Or you can
merge it if you like.

Re: [patch -mmotm 2/6] fix qla2xxx-use-memory_read_from_buffer.patch

[Andrew Vasquez]

On Thu, 17 Jul 2008, Andrew Morton wrote:

> > On Mon, 14 Jul 2008, Akinobu Mita wrote:
> > 
> > > 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>
> > 
> > If needed:
> > 
> > Acked-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
> 
> Thanks. So we now have tested-by:you and acked-by:you.  That'll do ;)
> 
> > BTW: is the memory_read_from_buffer() work for qla2xxx going in
> > through the mm tree submission path???
> 
> FSVO "through", yeah.  It's appeared on linux-scsi four times so far. 
> Last time James complained about the fs.h inclusion so Akinobu raised a
> patch "move memory_read_from_buffer() from fs.h to string.h" which I
> just merged.
> 
> I'll just keep pressing send - it'll get there sometime.  Or you can
> merge it if you like.

Would it too bothersome if I were to just collapse the two patches and
submit the composite with the my next set of patches???  Seems silly
to add the oneliner to the history...

Re: [patch -mmotm 2/6] fix qla2xxx-use-memory_read_from_buffer.patch

[Andrew Morton]

On Thu, 17 Jul 2008 16:44:16 -0700
Andrew Vasquez <andrew.vasquez@qlogic.com> wrote:

> On Thu, 17 Jul 2008, Andrew Morton wrote:
> 
> > > On Mon, 14 Jul 2008, Akinobu Mita wrote:
> > > 
> > > > 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>
> > > 
> > > If needed:
> > > 
> > > Acked-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
> > 
> > Thanks. So we now have tested-by:you and acked-by:you.  That'll do ;)
> > 
> > > BTW: is the memory_read_from_buffer() work for qla2xxx going in
> > > through the mm tree submission path???
> > 
> > FSVO "through", yeah.  It's appeared on linux-scsi four times so far. 
> > Last time James complained about the fs.h inclusion so Akinobu raised a
> > patch "move memory_read_from_buffer() from fs.h to string.h" which I
> > just merged.
> > 
> > I'll just keep pressing send - it'll get there sometime.  Or you can
> > merge it if you like.
> 
> Would it too bothersome if I were to just collapse the two patches and
> submit the composite with the my next set of patches???  Seems silly
> to add the oneliner to the history...

Sure, no probs.

[patch -mmotm 3/6] fix dcdbas-use-memory_read_from_buffer.patch

[Akinobu Mita]

[-- Attachment #1: dcdbas-use-memory_read_from_buffer-fix.patch --]
[-- Type: text/plain, Size: 662 bytes --]

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-mmotm/drivers/firmware/dcdbas.c
===================================================================
--- 2.6-mmotm.orig/drivers/firmware/dcdbas.c
+++ 2.6-mmotm/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 -mmotm 4/6] fix aty-use-memory_read_from_buffer.patch

[Akinobu Mita]

[-- Attachment #1: aty-use-memory_read_from_buffer-fix.patch --]
[-- Type: text/plain, Size: 713 bytes --]

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-mmotm/drivers/video/aty/radeon_base.c
===================================================================
--- 2.6-mmotm.orig/drivers/video/aty/radeon_base.c
+++ 2.6-mmotm/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 -mmotm 5/6] fix firmware-use-memory_read_from_buffer.patch

[Akinobu Mita]

[-- Attachment #1: firmware-use-memory_read_from_buffer-fix.patch --]
[-- Type: text/plain, Size: 694 bytes --]

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 |    1 -
 1 file changed, 1 deletion(-)

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

-- 

[patch -mmotm 6/6] fix dell_rbu-use-memory_read_from_buffer.patch

[Akinobu Mita]

[-- Attachment #1: dell_rbu-use-memory_read_from_buffer-fix.patch --]
[-- Type: text/plain, Size: 768 bytes --]

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-mmotm/drivers/firmware/dell_rbu.c
===================================================================
--- 2.6-mmotm.orig/drivers/firmware/dell_rbu.c
+++ 2.6-mmotm/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");

--