patch-2.3.99-pre7 linux/fs/autofs/root.c

• Lines: 26
• Date: Tue May 2 12:36:09 2000
• Orig file: v2.3.99-pre6/linux/fs/autofs/root.c
• Orig date: Wed Apr 26 16:34:09 2000

diff -u --recursive --new-file v2.3.99-pre6/linux/fs/autofs/root.c linux/fs/autofs/root.c
@@ -432,6 +432,7 @@
 /* Perform an expiry operation */
 static inline int autofs_expire_run(struct super_block *sb,
 				    struct autofs_sb_info *sbi,
+				    struct vfsmount *mnt,
 				    struct autofs_packet_expire *pkt_p)
 {
 	struct autofs_dir_ent *ent;
@@ -443,7 +444,7 @@
 	pkt.hdr.type = autofs_ptype_expire;
 
 	if ( !sbi->exp_timeout ||
-	     !(ent = autofs_expire(sb,sbi)) )
+	     !(ent = autofs_expire(sb,sbi,mnt)) )
 		return -EAGAIN;
 
 	pkt.len = ent->len;
@@ -487,7 +488,7 @@
 	case AUTOFS_IOC_SETTIMEOUT:
 		return autofs_get_set_timeout(sbi,(unsigned long *)arg);
 	case AUTOFS_IOC_EXPIRE:
-		return autofs_expire_run(inode->i_sb,sbi,
+		return autofs_expire_run(inode->i_sb, sbi, filp->f_vfsmnt,
 					 (struct autofs_packet_expire *)arg);
 	default:
 		return -ENOSYS;