Subject: afs/fs/afs super.c,1.9,1.10 mntpt.c,1.9,1.10 internal.h,1.15,1.16 cmservice.c,1.7,1.8

From: [email-masked]
Date: Fri, 15 Aug 2003 14:02:23 +0100

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

Modified Files:
	super.c mntpt.c internal.h cmservice.c 
Log Message:
#ifdef out requirement for automounting support

Index: super.c
===================================================================
RCS file: /home/cvs/afs/fs/afs/super.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- super.c	4 Jul 2003 15:26:31 -0000	1.9
+++ super.c	15 Aug 2003 13:02:20 -0000	1.10
@@ -85,7 +85,9 @@
 
 	kenter("");
 
+#ifdef AFS_AUTOMOUNT_SUPPORT
 	afs_timer_init(&afs_mntpt_expiry_timer, &afs_mntpt_expiry_timer_ops);
+#endif
 
 	/* create ourselves an inode cache */
 	atomic_set(&afs_count_active_inodes, 0);

Index: mntpt.c
===================================================================
RCS file: /home/cvs/afs/fs/afs/mntpt.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mntpt.c	13 Aug 2003 10:05:28 -0000	1.9
+++ mntpt.c	15 Aug 2003 13:02:20 -0000	1.10
@@ -30,7 +30,10 @@
 				       struct dentry *dentry,
 				       struct nameidata *nd);
 static int afs_mntpt_open(struct inode *inode, struct file *file);
+
+#ifdef AFS_AUTOMOUNT_SUPPORT
 static int afs_mntpt_follow_link(struct dentry *dentry, struct nameidata *nd);
+#endif
 
 struct file_operations afs_mntpt_file_operations = {
 	.open		= afs_mntpt_open,
@@ -38,11 +41,14 @@
 
 struct inode_operations afs_mntpt_inode_operations = {
 	.lookup		= afs_mntpt_lookup,
+#ifdef AFS_AUTOMOUNT_SUPPORT
 	.follow_link	= afs_mntpt_follow_link,
+#endif
 	.readlink	= page_readlink,
 	.getattr	= afs_inode_getattr,
 };
 
+#ifdef AFS_AUTOMOUNT_SUPPORT
 static LIST_HEAD(afs_vfsmounts);
 
 static void afs_mntpt_expiry_timed_out(struct afs_timer *timer);
@@ -54,6 +60,7 @@
 struct afs_timer afs_mntpt_expiry_timer;
 
 unsigned long afs_mntpt_expiry_timeout = 20;
+#endif
 
 /*****************************************************************************/
 /*
@@ -143,6 +150,7 @@
 	return -EREMOTE;
 } /* end afs_mntpt_open() */
 
+#ifdef AFS_AUTOMOUNT_SUPPORT
 /*****************************************************************************/
 /*
  * create a vfsmount to be automounted
@@ -275,3 +283,4 @@
 
 	kleave("");
 } /* end afs_mntpt_expiry_timed_out() */
+#endif

Index: internal.h
===================================================================
RCS file: /home/cvs/afs/fs/afs/internal.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- internal.h	4 Jul 2003 15:26:31 -0000	1.15
+++ internal.h	15 Aug 2003 13:02:20 -0000	1.16
@@ -92,11 +92,13 @@
  */
 extern struct inode_operations afs_mntpt_inode_operations;
 extern struct file_operations afs_mntpt_file_operations;
+#ifdef AFS_AUTOMOUNT_SUPPORT
 extern struct afs_timer afs_mntpt_expiry_timer;
 extern struct afs_timer_ops afs_mntpt_expiry_timer_ops;
+extern unsigned long afs_mntpt_expiry_timeout;
+#endif
 
 extern int afs_mntpt_check_symlink(afs_vnode_t *vnode);
-extern unsigned long afs_mntpt_expiry_timeout;
 
 /*
  * super.c

Index: cmservice.c
===================================================================
RCS file: /home/cvs/afs/fs/afs/cmservice.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- cmservice.c	4 Jul 2003 15:26:31 -0000	1.7
+++ cmservice.c	15 Aug 2003 13:02:20 -0000	1.8
@@ -311,8 +311,10 @@
 		if (ret<0)
 			goto kill;
 
+#ifdef AFS_AUTOMOUNT_SUPPORT
 		afs_kafstimod_add_timer(&afs_mntpt_expiry_timer,
 					afs_mntpt_expiry_timeout * HZ);
+#endif
 	}
 
 	afscm_usage++;
@@ -392,7 +394,9 @@
 		}
 		spin_unlock(&kafscmd_attention_lock);
 
+#ifdef AFS_AUTOMOUNT_SUPPORT
 		afs_kafstimod_del_timer(&afs_mntpt_expiry_timer);
+#endif
 	}
 
 	up_write(&afscm_sem);