patch-2.1.50 linux/fs/autofs/root.c

• Lines: 39
• Date: Thu Aug 14 12:56:14 1997
• Orig file: v2.1.49/linux/fs/autofs/root.c
• Orig date: Mon Aug 4 16:25:38 1997

diff -u --recursive --new-file v2.1.49/linux/fs/autofs/root.c linux/fs/autofs/root.c
@@ -176,6 +176,12 @@
 	return 1;
 }
 
+static struct dentry_operations autofs_dentry_operations = {
+	autofs_revalidate,
+	NULL,			/* d_hash */
+	NULL,			/* d_compare */
+};
+
 static int autofs_root_lookup(struct inode *dir, struct dentry * dentry)
 {
 	struct autofs_sb_info *sbi;
@@ -204,14 +210,23 @@
 	 *
 	 * We need to do this before we release the directory semaphore.
 	 */
-	dentry->d_revalidate = autofs_revalidate;
+	dentry->d_op = &autofs_dentry_operations;
 	dentry->d_flags |= DCACHE_AUTOFS_PENDING;
 	d_add(dentry, NULL);
 
 	up(&dir->i_sem);
 	autofs_revalidate(dentry);
 	down(&dir->i_sem);
-	
+
+	/*
+	 * If we are still pending, check if we had to handle
+	 * a signal. If so we can force a restart..
+	 */
+	if (dentry->d_flags & DCACHE_AUTOFS_PENDING) {
+		if (current->signal & ~current->blocked)
+			return -ERESTARTNOINTR;
+	}
+
 	return 0;
 }