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
Cc: James Bottomley
Cc: Geert Uytterhoeven
Cc: Zhang Rui
Cc: Bob Moore
Cc: Thomas Renninger
Cc: Len Brown
Cc: Martin Schwidefsky
Cc: Heiko Carstens
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
#include
#include
-#include

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

--
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/