summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2013-06-19 15:26:04 +0400
committerAl Viro <viro@zeniv.linux.org.uk>2013-06-29 12:57:34 +0400
commit68d70d03f8f5bd10a0e7337210b13f536fd4aeb9 (patch)
tree2d55d3c5286748ce3cf3828f877cdf703c9b1249
parentee32465249bee53714c0ca7be38da83008f9f8a6 (diff)
constify rw_verify_area()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--fs/aio.c2
-rw-r--r--fs/internal.h1
-rw-r--r--fs/read_write.c2
-rw-r--r--include/linux/fs.h1
4 files changed, 4 insertions, 2 deletions
diff --git a/fs/aio.c b/fs/aio.c
index 2bbcacf74d0c..a8ecc8313fb0 100644
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -39,6 +39,8 @@
#include <asm/kmap_types.h>
#include <asm/uaccess.h>
+#include "internal.h"
+
#define AIO_RING_MAGIC 0xa10a10a1
#define AIO_RING_COMPAT_FEATURES 1
#define AIO_RING_INCOMPAT_FEATURES 0
diff --git a/fs/internal.h b/fs/internal.h
index f6ad34362823..7c5f01cf619d 100644
--- a/fs/internal.h
+++ b/fs/internal.h
@@ -131,6 +131,7 @@ extern struct dentry *__d_alloc(struct super_block *, const struct qstr *);
* read_write.c
*/
extern ssize_t __kernel_write(struct file *, const char *, size_t, loff_t *);
+extern int rw_verify_area(int, struct file *, const loff_t *, size_t);
/*
* splice.c
diff --git a/fs/read_write.c b/fs/read_write.c
index 782dfc3acebc..fd72b592aa1b 100644
--- a/fs/read_write.c
+++ b/fs/read_write.c
@@ -316,7 +316,7 @@ out_putf:
* them to something that fits in "int" so that others
* won't have to do range checks all the time.
*/
-int rw_verify_area(int read_write, struct file *file, loff_t *ppos, size_t count)
+int rw_verify_area(int read_write, struct file *file, const loff_t *ppos, size_t count)
{
struct inode *inode;
loff_t pos;
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 803b7fa2520a..68f10204ab29 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1898,7 +1898,6 @@ extern int current_umask(void);
extern struct kobject *fs_kobj;
#define MAX_RW_COUNT (INT_MAX & PAGE_CACHE_MASK)
-extern int rw_verify_area(int, struct file *, loff_t *, size_t);
#define FLOCK_VERIFY_READ 1
#define FLOCK_VERIFY_WRITE 2