[PATCH] misc verify_area cleanups

There were still a few comments left refering to verify_area, and two
functions, verify_area_skas & verify_area_tt that just wrap corresponding
access_ok_skas & access_ok_tt functions, just like verify_area does for
access_ok - deprecate those.

There was also a few places that still used verify_area in commented-out
code, fix those up to use access_ok.

After applying this one there should not be anything left but finally
removing verify_area completely, which will happen after a kernel release
or two.

Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

4 files changed, 6 insertions, 6 deletions

diff --git a/net/8021q/vlanproc.c b/net/8021q/vlanproc.c
index c32d27af0a3f..7b214cffc956 100644
--- a/net/8021q/vlanproc.c
+++ b/net/8021q/vlanproc.c
@@ -23,7 +23,7 @@
 #include <linux/errno.h>        /* return codes */
 #include <linux/kernel.h>
 #include <linux/slab.h>         /* kmalloc(), kfree() */
-#include <linux/mm.h>           /* verify_area(), etc. */
+#include <linux/mm.h>
 #include <linux/string.h>       /* inline mem*, str* functions */
 #include <linux/init.h>         /* __initfunc et al. */
 #include <asm/byteorder.h>      /* htons(), etc. */
diff --git a/net/atm/common.c b/net/atm/common.c
index 6d16be334ea0..e93e838069e8 100644
--- a/net/atm/common.c
+++ b/net/atm/common.c
@@ -12,7 +12,7 @@
 #include <linux/socket.h>       /* SOL_SOCKET */
 #include <linux/errno.h>        /* error codes */
 #include <linux/capability.h>
-#include <linux/mm.h>           /* verify_area */
+#include <linux/mm.h>
 #include <linux/sched.h>
 #include <linux/time.h>         /* struct timeval */
 #include <linux/skbuff.h>
@@ -540,7 +540,7 @@ int vcc_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *m,
                 error = -EMSGSIZE;
                 goto out;
         }
-        /* verify_area is done by net/socket.c */
+
         eff = (size+3) & ~3; /* align to word boundary */
         prepare_to_wait(sk->sk_sleep, &wait, TASK_INTERRUPTIBLE);
         error = 0;
diff --git a/net/core/iovec.c b/net/core/iovec.c
index d57ace949ab8..65e4b56fbc77 100644
--- a/net/core/iovec.c
+++ b/net/core/iovec.c
@@ -33,7 +33,7 @@
  *      Verify iovec. The caller must ensure that the iovec is big enough
  *      to hold the message iovec.
  *
- *      Save time not doing verify_area. copy_*_user will make this work
+ *      Save time not doing access_ok. copy_*_user will make this work
  *      in any case.
  */
 
diff --git a/net/wanrouter/wanmain.c b/net/wanrouter/wanmain.c
index 956c17f6c548..d6844ac226f5 100644
--- a/net/wanrouter/wanmain.c
+++ b/net/wanrouter/wanmain.c
@@ -48,8 +48,8 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/module.h>       /* support for loadable modules */
-#include <linux/slab.h> /* kmalloc(), kfree() */
-#include <linux/mm.h>           /* verify_area(), etc. */
+#include <linux/slab.h>         /* kmalloc(), kfree() */
+#include <linux/mm.h>
 #include <linux/string.h>       /* inline mem*, str* functions */
 
 #include <asm/byteorder.h>      /* htons(), etc. */