take count and rcu_head out of fs_pin
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
diff --git a/kernel/acct.c b/kernel/acct.c
index a74f3d1..b8fbefb 100644
--- a/kernel/acct.c
+++ b/kernel/acct.c
@@ -80,6 +80,8 @@
struct bsd_acct_struct {
struct fs_pin pin;
+ atomic_long_t count;
+ struct rcu_head rcu;
struct mutex lock;
int active;
unsigned long needcheck;
@@ -126,8 +128,8 @@
static void acct_put(struct bsd_acct_struct *p)
{
- if (atomic_long_dec_and_test(&p->pin.count))
- kfree_rcu(p, pin.rcu);
+ if (atomic_long_dec_and_test(&p->count))
+ kfree_rcu(p, rcu);
}
static struct bsd_acct_struct *acct_get(struct pid_namespace *ns)
@@ -141,7 +143,7 @@
rcu_read_unlock();
return NULL;
}
- if (!atomic_long_inc_not_zero(&res->pin.count)) {
+ if (!atomic_long_inc_not_zero(&res->count)) {
rcu_read_unlock();
cpu_relax();
goto again;
@@ -179,7 +181,7 @@
pin_remove(&acct->pin);
ns->bacct = new;
acct->ns = NULL;
- atomic_long_dec(&acct->pin.count);
+ atomic_long_dec(&acct->count);
mutex_unlock(&acct->lock);
acct_put(acct);
}
@@ -189,7 +191,7 @@
{
struct bsd_acct_struct *acct;
acct = container_of(pin, struct bsd_acct_struct, pin);
- if (!atomic_long_inc_not_zero(&pin->count)) {
+ if (!atomic_long_inc_not_zero(&acct->count)) {
rcu_read_unlock();
cpu_relax();
return;
@@ -250,7 +252,7 @@
mnt = file->f_path.mnt;
file->f_path.mnt = internal;
- atomic_long_set(&acct->pin.count, 1);
+ atomic_long_set(&acct->count, 1);
acct->pin.kill = acct_pin_kill;
acct->file = file;
acct->needcheck = jiffies;