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

Next file: linux/fs/bfs/file.c
Previous file: linux/fs/autofs4/expire.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.99-pre6/linux/fs/autofs4/root.c linux/fs/autofs4/root.c
@@ -120,7 +120,7 @@
 	struct dentry *top = dentry->d_sb->s_root;
 
 	for(; dentry != top; dentry = dentry->d_parent) {
-		struct autofs_info *ino = autofs4_dentry_ino(dentry->d_covers);
+		struct autofs_info *ino = autofs4_dentry_ino(dentry);
 
 		if (ino) {
 			update_atime(dentry->d_inode);
@@ -575,11 +575,12 @@
 
 	/* return a single thing to expire */
 	case AUTOFS_IOC_EXPIRE:
-		return autofs4_expire_run(inode->i_sb,sbi,
+		return autofs4_expire_run(inode->i_sb,filp->f_vfsmnt,sbi,
 					 (struct autofs_packet_expire *)arg);
 	/* same as above, but can send multiple expires through pipe */
 	case AUTOFS_IOC_EXPIRE_MULTI:
-		return autofs4_expire_multi(inode->i_sb, sbi, (int *)arg);
+		return autofs4_expire_multi(inode->i_sb,filp->f_vfsmnt,sbi,
+					(int *)arg);
 
 	default:
 		return -ENOSYS;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)