Merge tag 'iio-fixes-for-5.3a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23...

[linux.git] / fs / fs_pin.c

diff --git a/fs/fs_pin.c b/fs/fs_pin.c
index 0d285fd5b44ab6d16d2377f3a19ef7fb6cc06384..47ef3c71ce907789994f73e49b2d6b072022463e 100644 (file)
--- a/fs/fs_pin.c
+++ b/fs/fs_pin.c
@@ -19,20 +19,14 @@ void pin_remove(struct fs_pin *pin)
        spin_unlock_irq(&pin->wait.lock);
 }
 
-void pin_insert_group(struct fs_pin *pin, struct vfsmount *m, struct hlist_head *p)
+void pin_insert(struct fs_pin *pin, struct vfsmount *m)
 {
        spin_lock(&pin_lock);
-       if (p)
-               hlist_add_head(&pin->s_list, p);
+       hlist_add_head(&pin->s_list, &m->mnt_sb->s_pins);
        hlist_add_head(&pin->m_list, &real_mount(m)->mnt_pins);
        spin_unlock(&pin_lock);
 }
 
-void pin_insert(struct fs_pin *pin, struct vfsmount *m)
-{
-       pin_insert_group(pin, m, &m->mnt_sb->s_pins);
-}
-
 void pin_kill(struct fs_pin *p)
 {
        wait_queue_entry_t wait;
@@ -79,7 +73,7 @@ void mnt_pin_kill(struct mount *m)
        while (1) {
                struct hlist_node *p;
                rcu_read_lock();
-               p = ACCESS_ONCE(m->mnt_pins.first);
+               p = READ_ONCE(m->mnt_pins.first);
                if (!p) {
                        rcu_read_unlock();
                        break;
@@ -93,7 +87,7 @@ void group_pin_kill(struct hlist_head *p)
        while (1) {
                struct hlist_node *q;
                rcu_read_lock();
-               q = ACCESS_ONCE(p->first);
+               q = READ_ONCE(p->first);
                if (!q) {
                        rcu_read_unlock();
                        break;