kill pin_put()

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

diff --git a/fs/fs_pin.c b/fs/fs_pin.c
index 9368236ca100bc311fe721c15eca9e3bfdcb2f0f..f173313760b8e61e06fb3466cb48d1f436f20371 100644 (file)
--- a/fs/fs_pin.c
+++ b/fs/fs_pin.c
@@ -4,19 +4,8 @@
 #include "internal.h"
 #include "mount.h"
 
-static void pin_free_rcu(struct rcu_head *head)
-{
-       kfree(container_of(head, struct fs_pin, rcu));
-}
-
 static DEFINE_SPINLOCK(pin_lock);
 
-void pin_put(struct fs_pin *p)
-{
-       if (atomic_long_dec_and_test(&p->count))
-               call_rcu(&p->rcu, pin_free_rcu);
-}
-
 void pin_remove(struct fs_pin *pin)
 {
        spin_lock(&pin_lock);

diff --git a/include/linux/fs_pin.h b/include/linux/fs_pin.h
index f66525e72ccf1a4002df46354a9e59927b5f821d..68a54b7741aa9a4165275ef68d8509b3ad921838 100644 (file)
--- a/include/linux/fs_pin.h
+++ b/include/linux/fs_pin.h
@@ -12,6 +12,5 @@ struct fs_pin {
        void (*kill)(struct fs_pin *);
 };
 
-void pin_put(struct fs_pin *);
 void pin_remove(struct fs_pin *);
 void pin_insert(struct fs_pin *, struct vfsmount *);

diff --git a/kernel/acct.c b/kernel/acct.c
index 33738ef972f3b917f0820e3c751978e7956b1d4a..7bb9e659a7da7f2530830df0dca01fa02a5e0fef 100644 (file)
--- a/kernel/acct.c
+++ b/kernel/acct.c
@@ -124,6 +124,12 @@ out:
        return acct->active;
 }
 
+static void acct_put(struct bsd_acct_struct *p)
+{
+       if (atomic_long_dec_and_test(&p->pin.count))
+               kfree_rcu(p, pin.rcu);
+}
+
 static struct bsd_acct_struct *acct_get(struct pid_namespace *ns)
 {
        struct bsd_acct_struct *res;
@@ -144,7 +150,7 @@ again:
        mutex_lock(&res->lock);
        if (!res->ns) {
                mutex_unlock(&res->lock);
-               pin_put(&res->pin);
+               acct_put(res);
                goto again;
        }
        return res;
@@ -175,7 +181,7 @@ static void acct_kill(struct bsd_acct_struct *acct,
                acct->ns = NULL;
                atomic_long_dec(&acct->pin.count);
                mutex_unlock(&acct->lock);
-               pin_put(&acct->pin);
+               acct_put(acct);
        }
 }
 
@@ -186,7 +192,7 @@ static void acct_pin_kill(struct fs_pin *pin)
        mutex_lock(&acct->lock);
        if (!acct->ns) {
                mutex_unlock(&acct->lock);
-               pin_put(pin);
+               acct_put(acct);
                acct = NULL;
        }
        acct_kill(acct, NULL);
@@ -576,7 +582,7 @@ static void slow_acct_process(struct pid_namespace *ns)
                if (acct) {
                        do_acct_process(acct);
                        mutex_unlock(&acct->lock);
-                       pin_put(&acct->pin);
+                       acct_put(acct);
                }
        }
 }