Subject: afs/fs/afs volume.h,1.5,1.6 vlocation.c,1.10,1.11 mount.h,1.1.1.1,1.2 mntpt.c,1.8,1.9

From: [email-masked]
Date: Wed, 13 Aug 2003 11:05:32 +0100

Update of /home/cvs/afs/fs/afs
In directory phoenix.infradead.org:/tmp/cvs-serv701/fs/afs

Modified Files:
	volume.h vlocation.c mount.h mntpt.c 
Log Message:
changed u_intXX_t to uintXX_t

Index: volume.h
===================================================================
RCS file: /home/cvs/afs/fs/afs/volume.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- volume.h	4 Jul 2003 15:26:31 -0000	1.5
+++ volume.h	13 Aug 2003 10:05:28 -0000	1.6
@@ -27,7 +27,7 @@
 	
 } __attribute__((packed)) afs_vlocation_upd_t;
 
-typedef u_int8_t afs_cache_vtype_t;
+typedef uint8_t afs_cache_vtype_t;
 
 /*****************************************************************************/
 /*
@@ -35,10 +35,10 @@
  */
 struct afs_cache_vlocation
 {
-	u_int8_t		name[64];	/* volume name (lowercase, padded with NULs) */
-	u_int8_t		nservers;	/* number of entries used in servers[] */
-	u_int8_t		vidmask;	/* voltype mask for vid[] */
-	u_int8_t		srvtmask[8];	/* voltype masks for servers[] */
+	uint8_t			name[64];	/* volume name (lowercase, padded with NULs) */
+	uint8_t			nservers;	/* number of entries used in servers[] */
+	uint8_t			vidmask;	/* voltype mask for vid[] */
+	uint8_t			srvtmask[8];	/* voltype masks for servers[] */
 #define AFS_VOL_VTM_RW	0x01 /* R/W version of the volume is available (on this server) */
 #define AFS_VOL_VTM_RO	0x02 /* R/O version of the volume is available (on this server) */
 #define AFS_VOL_VTM_BAK	0x04 /* backup version of the volume is available (on this server) */
@@ -57,7 +57,7 @@
 struct afs_cache_vhash
 {
 	afs_voltype_t		vtype;		/* which volume variation */
-	u_int8_t		hash_bucket;	/* which hash bucket this represents */
+	uint8_t			hash_bucket;	/* which hash bucket this represents */
 } __attribute__((packed));
 
 extern struct cachefs_index_def afs_volume_cache_index_def;

Index: vlocation.c
===================================================================
RCS file: /home/cvs/afs/fs/afs/vlocation.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- vlocation.c	10 Jul 2003 11:07:01 -0000	1.10
+++ vlocation.c	13 Aug 2003 10:05:28 -0000	1.11
@@ -498,7 +498,7 @@
 {
 	afs_cell_t *cell;
 
-	kenter("%s",vlocation->vldb.name);
+	_enter("%s",vlocation->vldb.name);
 
 	cell = vlocation->cell;
 
@@ -513,7 +513,7 @@
 	spin_unlock(&cell->vl_gylock);
 
 	if (!vlocation) {
-		kleave("");
+		_leave("");
 		return; /* resurrected */
 	}
 
@@ -523,7 +523,7 @@
 
 	kfree(vlocation);
 
-	kleave(" [destroyed]");
+	_leave(" [destroyed]");
 } /* end afs_vlocation_do_timeout() */
 
 /*****************************************************************************/

Index: mount.h
===================================================================
RCS file: /home/cvs/afs/fs/afs/mount.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- mount.h	19 Jun 2002 13:34:06 -0000	1.1.1.1
+++ mount.h	13 Aug 2003 10:05:28 -0000	1.2
@@ -17,7 +17,7 @@
 	const char		*cell;		/* name of cell containing volume */
 	const char		*cache;		/* name of cache block device */
 	size_t			nservers;	/* number of server addresses listed */
-	u_int32_t		servers[10];	/* IP addresses of servers in this cell */
+	uint32_t		servers[10];	/* IP addresses of servers in this cell */
 };
 
 #endif /* _LINUX_AFS_MOUNT_H */

Index: mntpt.c
===================================================================
RCS file: /home/cvs/afs/fs/afs/mntpt.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mntpt.c	10 Jul 2003 11:07:01 -0000	1.8
+++ mntpt.c	13 Aug 2003 10:05:28 -0000	1.9
@@ -26,7 +26,9 @@
 #include "internal.h"

-static struct dentry *afs_mntpt_lookup(struct inode *dir, struct dentry *dentry);
+static struct dentry *afs_mntpt_lookup(struct inode *dir,
+				       struct dentry *dentry,
+				       struct nameidata *nd);
 static int afs_mntpt_open(struct inode *inode, struct file *file);
 static int afs_mntpt_follow_link(struct dentry *dentry, struct nameidata *nd);
 
@@ -112,7 +114,9 @@
 /*
  * no valid lookup procedure on this sort of dir
  */
-static struct dentry *afs_mntpt_lookup(struct inode *dir, struct dentry *dentry)
+static struct dentry *afs_mntpt_lookup(struct inode *dir,
+				       struct dentry *dentry,
+				       struct nameidata *nd)
 {
 	kenter("%p,%p{%p{%s},%s}",
 	       dir,