linux-vax-kern-commit

[Andy P. <at...@us...>]

Update of /cvsroot/linux-vax/kernel-2.4/fs/autofs
In directory usw-pr-cvs1:/tmp/cvs-serv24187/autofs

Modified Files:
	autofs_i.h init.c inode.c root.c 
Log Message:
synch 2.4.15 commit 6


Index: autofs_i.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/fs/autofs/autofs_i.h,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -r1.1.1.2 -r1.2
--- autofs_i.h	25 Feb 2001 23:14:46 -0000	1.1.1.2
+++ autofs_i.h	9 Apr 2002 12:57:26 -0000	1.2
@@ -89,7 +89,8 @@
 #define AUTOFS_FIRST_SYMLINK 2
 #define AUTOFS_FIRST_DIR_INO (AUTOFS_FIRST_SYMLINK+AUTOFS_MAX_SYMLINKS)
 
-#define AUTOFS_SYMLINK_BITMAP_LEN ((AUTOFS_MAX_SYMLINKS+31)/32)
+#define AUTOFS_SYMLINK_BITMAP_LEN \
+	((AUTOFS_MAX_SYMLINKS+((sizeof(long)*1)-1))/(sizeof(long)*8))
 
 #define AUTOFS_SBI_MAGIC 0x6d4a556d
 
@@ -103,10 +104,10 @@
 	struct autofs_wait_queue *queues; /* Wait queue pointer */
 	struct autofs_dirhash dirhash; /* Root directory hash */
 	struct autofs_symlink symlink[AUTOFS_MAX_SYMLINKS];
-	u32 symlink_bitmap[AUTOFS_SYMLINK_BITMAP_LEN];
+	unsigned long symlink_bitmap[AUTOFS_SYMLINK_BITMAP_LEN];
 };
 
-extern inline struct autofs_sb_info *autofs_sbi(struct super_block *sb)
+static inline struct autofs_sb_info *autofs_sbi(struct super_block *sb)
 {
 	return (struct autofs_sb_info *)(sb->u.generic_sbp);
 }

Index: init.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/fs/autofs/init.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- init.c	14 Jan 2001 16:29:28 -0000	1.1.1.1
+++ init.c	9 Apr 2002 12:57:26 -0000	1.2
@@ -38,3 +38,4 @@
 	printk(")\n");
 }
 #endif
+MODULE_LICENSE("GPL");

Index: inode.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/fs/autofs/inode.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -r1.1.1.2 -r1.2
--- inode.c	25 Feb 2001 23:14:46 -0000	1.1.1.2
+++ inode.c	9 Apr 2002 12:57:26 -0000	1.2
@@ -132,7 +132,7 @@
 	sbi->oz_pgrp = current->pgrp;
 	autofs_initialize_hash(&sbi->dirhash);
 	sbi->queues = NULL;
-	memset(sbi->symlink_bitmap, 0, sizeof(u32)*AUTOFS_SYMLINK_BITMAP_LEN);
+	memset(sbi->symlink_bitmap, 0, sizeof(long)*AUTOFS_SYMLINK_BITMAP_LEN);
 	sbi->next_dir_ino = AUTOFS_FIRST_DIR_INO;
 	s->s_blocksize = 1024;
 	s->s_blocksize_bits = 10;

Index: root.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/fs/autofs/root.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- root.c	14 Jan 2001 16:29:31 -0000	1.1.1.1
+++ root.c	9 Apr 2002 12:57:26 -0000	1.2
@@ -422,12 +422,11 @@
 static inline int autofs_get_set_timeout(struct autofs_sb_info *sbi,
 					 unsigned long *p)
 {
-	int rv;
 	unsigned long ntimeout;
 
-	if ( (rv = get_user(ntimeout, p)) ||
-	     (rv = put_user(sbi->exp_timeout/HZ, p)) )
-		return rv;
+	if (get_user(ntimeout, p) ||
+	    put_user(sbi->exp_timeout / HZ, p))
+		return -EFAULT;
 
 	if ( ntimeout > ULONG_MAX/HZ )
 		sbi->exp_timeout = 0;