[PATCH 16/16] GFS2: Exported functions

[PATCH 16/16] GFS2: Exported functions

[Steven Whitehouse]

[PATCH 16/16] GFS2: Exported functions

Export tty_write_message(). This is required by the quota code and is
used in the same way as the core kernel quota code uses it. Also
export the routine for initialising ra_state structures and the
file_read_actor for GFS2's internal read routines.


Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Signed-off-by: David Teigland <teigland@redhat.com>


 kernel/printk.c |    1 +
 mm/filemap.c    |    1 +
 mm/readahead.c  |    1 +
 3 files changed, 3 insertions(+)

--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -997,6 +997,7 @@ void tty_write_message(struct tty_struct
 		tty->driver->write(tty, msg, strlen(msg));
 	return;
 }
+EXPORT_SYMBOL_GPL(tty_write_message);
 
 /*
  * printk rate limiting, lifted from the networking subsystem.
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -1012,6 +1012,7 @@ success:
 	desc->arg.buf += size;
 	return size;
 }
+EXPORT_SYMBOL(file_read_actor);
 
 /*
  * This is the "read()" routine for all filesystems
--- a/mm/readahead.c
+++ b/mm/readahead.c
@@ -38,6 +38,7 @@ file_ra_state_init(struct file_ra_state 
 	ra->ra_pages = mapping->backing_dev_info->ra_pages;
 	ra->prev_page = -1;
 }
+EXPORT_SYMBOL_GPL(file_ra_state_init);
 
 /*
  * Return max readahead size for this inode in number-of-pages.

[PATCH 16/16] GFS2: Exported functions

[Steven Whitehouse]

[PATCH 16/16] GFS2: Exported functions

Export the routine for initialising ra_state structure. This allows
GFS2 to use the standard kernel readahead when reading its internal
files. Also a modification to the read path for direct i/o allows
a 0 return from the direct i/o function provided by the filesystem
to result in a "normal" buffered i/o. GFS2 uses this in cases where
direct i/o isn't possible for some reason (e.g. the file is "stuffed"
and this not aligned on disk).


Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Signed-off-by: David Teigland <teigland@redhat.com>


 mm/filemap.c   |    3 ++-
 mm/readahead.c |    1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -1181,7 +1181,8 @@ __generic_file_aio_read(struct kiocb *io
 				*ppos = pos + retval;
 		}
 		file_accessed(filp);
-		goto out;
+		if (retval != 0)
+			goto out;
 	}
 
 	retval = 0;
--- a/mm/readahead.c
+++ b/mm/readahead.c
@@ -38,6 +38,7 @@ file_ra_state_init(struct file_ra_state 
 	ra->ra_pages = mapping->backing_dev_info->ra_pages;
 	ra->prev_page = -1;
 }
+EXPORT_SYMBOL_GPL(file_ra_state_init);
 
 /*
  * Return max readahead size for this inode in number-of-pages.