diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2010-03-03 12:58:31 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2010-03-03 12:58:31 -0500 |
commit | 4b1ae27a96d9860e6c4348673e8fb6a0322511fe (patch) | |
tree | d9d195bfef3e8e746ef68adb4364516633d27313 /fs/autofs4/autofs_i.h | |
parent | 60b341b778cc2929df16c0a504c91621b3c6a4ad (diff) |
Revert "autofs4: always use lookup for lookup"
This reverts commit 213614d583748d00967a91cacd656f417efb36ce.
Alas, ->d_revalidate() can't rely on ->lookup() finishing what
it's started; if d_alloc() in do_lookup() fails, we are not going
to call ->lookup() at all.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/autofs4/autofs_i.h')
-rw-r--r-- | fs/autofs4/autofs_i.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/fs/autofs4/autofs_i.h b/fs/autofs4/autofs_i.h index 0118d67221b2..3d283abf67d7 100644 --- a/fs/autofs4/autofs_i.h +++ b/fs/autofs4/autofs_i.h | |||
@@ -60,11 +60,6 @@ do { \ | |||
60 | current->pid, __func__, ##args); \ | 60 | current->pid, __func__, ##args); \ |
61 | } while (0) | 61 | } while (0) |
62 | 62 | ||
63 | struct rehash_entry { | ||
64 | struct task_struct *task; | ||
65 | struct list_head list; | ||
66 | }; | ||
67 | |||
68 | /* Unified info structure. This is pointed to by both the dentry and | 63 | /* Unified info structure. This is pointed to by both the dentry and |
69 | inode structures. Each file in the filesystem has an instance of this | 64 | inode structures. Each file in the filesystem has an instance of this |
70 | structure. It holds a reference to the dentry, so dentries are never | 65 | structure. It holds a reference to the dentry, so dentries are never |
@@ -81,7 +76,6 @@ struct autofs_info { | |||
81 | 76 | ||
82 | struct list_head active; | 77 | struct list_head active; |
83 | int active_count; | 78 | int active_count; |
84 | struct list_head rehash_list; | ||
85 | 79 | ||
86 | struct list_head expiring; | 80 | struct list_head expiring; |
87 | 81 | ||
@@ -104,7 +98,6 @@ struct autofs_info { | |||
104 | #define AUTOFS_INF_EXPIRING (1<<0) /* dentry is in the process of expiring */ | 98 | #define AUTOFS_INF_EXPIRING (1<<0) /* dentry is in the process of expiring */ |
105 | #define AUTOFS_INF_MOUNTPOINT (1<<1) /* mountpoint status for direct expire */ | 99 | #define AUTOFS_INF_MOUNTPOINT (1<<1) /* mountpoint status for direct expire */ |
106 | #define AUTOFS_INF_PENDING (1<<2) /* dentry pending mount */ | 100 | #define AUTOFS_INF_PENDING (1<<2) /* dentry pending mount */ |
107 | #define AUTOFS_INF_REHASH (1<<3) /* dentry in transit to ->lookup() */ | ||
108 | 101 | ||
109 | struct autofs_wait_queue { | 102 | struct autofs_wait_queue { |
110 | wait_queue_head_t queue; | 103 | wait_queue_head_t queue; |