hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

kill pin_put() 

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2015-01-09 20:40:02 -05:00
parent 92fc41c3a6
commit 9e251d0204
3 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fs/fs_pin.c
View File

@ -4,19 +4,8 @@
#include "internal.h" #include "internal.h"
#include "mount.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); 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) void pin_remove(struct fs_pin *pin)
{ {
spin_lock(&pin_lock); spin_lock(&pin_lock);

1
include/linux/fs_pin.h
View File

@ -12,6 +12,5 @@ struct fs_pin {
void (*kill)(struct fs_pin *); void (*kill)(struct fs_pin *);
}; };
void pin_put(struct fs_pin *);
void pin_remove(struct fs_pin *); void pin_remove(struct fs_pin *);
void pin_insert(struct fs_pin *, struct vfsmount *); void pin_insert(struct fs_pin *, struct vfsmount *);

14
kernel/acct.c
View File

@ -124,6 +124,12 @@ out:
return acct->active; 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) static struct bsd_acct_struct *acct_get(struct pid_namespace *ns)
{ {
struct bsd_acct_struct *res; struct bsd_acct_struct *res;
@ -144,7 +150,7 @@ again:
mutex_lock(&res->lock); mutex_lock(&res->lock);
if (!res->ns) { if (!res->ns) {
mutex_unlock(&res->lock); mutex_unlock(&res->lock);
pin_put(&res->pin); acct_put(res);
goto again; goto again;
} }
return res; return res;
@ -175,7 +181,7 @@ static void acct_kill(struct bsd_acct_struct *acct,
acct->ns = NULL; acct->ns = NULL;
atomic_long_dec(&acct->pin.count); atomic_long_dec(&acct->pin.count);
mutex_unlock(&acct->lock); 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); mutex_lock(&acct->lock);
if (!acct->ns) { if (!acct->ns) {
mutex_unlock(&acct->lock); mutex_unlock(&acct->lock);
pin_put(pin); acct_put(acct);
acct = NULL; acct = NULL;
} }
acct_kill(acct, NULL); acct_kill(acct, NULL);
@ -576,7 +582,7 @@ static void slow_acct_process(struct pid_namespace *ns)
if (acct) { if (acct) {
do_acct_process(acct); do_acct_process(acct);
mutex_unlock(&acct->lock); mutex_unlock(&acct->lock);
pin_put(&acct->pin); acct_put(acct);
} }
} }
} }