get rid of autofs_info->active_count

autofs_add_active() is always called only once (and on a dentry
with freshly allocated ino, at that).  autofs_del_active() is
never called more than once.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/fs/autofs/autofs_i.h b/fs/autofs/autofs_i.h
index 8c0c11181fad765159309246ca075e19701d1c88..8bcec8dcabb67787930e5932ce7d6c8a6c18b353 100644 (file)
--- a/fs/autofs/autofs_i.h
+++ b/fs/autofs/autofs_i.h
@@ -58,7 +58,6 @@ struct autofs_info {
        struct completion expire_complete;
 
        struct list_head active;
-       int active_count;
 
        struct list_head expiring;
 

diff --git a/fs/autofs/root.c b/fs/autofs/root.c
index e646569c75eda3a9d47674dca2c2b3b1a778dfc7..64f974c61068a9bc6c1ad9d4ca5131c833ed6bc7 100644 (file)
--- a/fs/autofs/root.c
+++ b/fs/autofs/root.c
@@ -60,38 +60,15 @@ const struct dentry_operations autofs_dentry_operations = {
        .d_release      = autofs_dentry_release,
 };
 
-static void autofs_add_active(struct dentry *dentry)
-{
-       struct autofs_sb_info *sbi = autofs_sbi(dentry->d_sb);
-       struct autofs_info *ino;
-
-       ino = autofs_dentry_ino(dentry);
-       if (ino) {
-               spin_lock(&sbi->lookup_lock);
-               if (!ino->active_count) {
-                       if (list_empty(&ino->active))
-                               list_add(&ino->active, &sbi->active_list);
-               }
-               ino->active_count++;
-               spin_unlock(&sbi->lookup_lock);
-       }
-}
-
 static void autofs_del_active(struct dentry *dentry)
 {
        struct autofs_sb_info *sbi = autofs_sbi(dentry->d_sb);
        struct autofs_info *ino;
 
        ino = autofs_dentry_ino(dentry);
-       if (ino) {
-               spin_lock(&sbi->lookup_lock);
-               ino->active_count--;
-               if (!ino->active_count) {
-                       if (!list_empty(&ino->active))
-                               list_del_init(&ino->active);
-               }
-               spin_unlock(&sbi->lookup_lock);
-       }
+       spin_lock(&sbi->lookup_lock);
+       list_del_init(&ino->active);
+       spin_unlock(&sbi->lookup_lock);
 }
 
 static int autofs_dir_open(struct inode *inode, struct file *file)
@@ -539,7 +516,9 @@ static struct dentry *autofs_lookup(struct inode *dir,
                dentry->d_fsdata = ino;
                ino->dentry = dentry;
 
-               autofs_add_active(dentry);
+               spin_lock(&sbi->lookup_lock);
+               list_add(&ino->active, &sbi->active_list);
+               spin_unlock(&sbi->lookup_lock);
        }
        return NULL;
 }