patch-2.1.54 linux/fs/autofs/root.c

Next file: linux/fs/autofs/waitq.c
Previous file: linux/fs/autofs/init.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.53/linux/fs/autofs/root.c linux/fs/autofs/root.c
@@ -394,16 +394,9 @@
 	int rv;
 	unsigned long ntimeout;
 
-#if LINUX_VERSION_CODE < kver(2,1,0)
-	if ( (rv = verify_area(VERIFY_WRITE, p, sizeof(unsigned long))) )
-		return rv;
-	ntimeout = get_user(p);
-	put_user(sbi->exp_timeout/HZ, p);
-#else
 	if ( (rv = get_user(ntimeout, p)) ||
 	     (rv = put_user(sbi->exp_timeout/HZ, p)) )
 		return rv;
-#endif
 
 	if ( ntimeout > ULONG_MAX/HZ )
 		sbi->exp_timeout = 0;
@@ -416,15 +409,7 @@
 /* Return protocol version */
 static inline int autofs_get_protover(int *p)
 {
-#if LINUX_VERSION_CODE < kver(2,1,0)
-	int rv;
-	if ( (rv = verify_area(VERIFY_WRITE, p, sizeof(int))) )
-		return rv;
-	put_user(AUTOFS_PROTO_VERSION, p);
-	return 0;
-#else
 	return put_user(AUTOFS_PROTO_VERSION, p);
-#endif
 }
 
 /* Perform an expiry operation */

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov