pull bumping refcount into ->kill()
authorAl Viro <viro@zeniv.linux.org.uk>
Sat, 10 Jan 2015 05:07:35 +0000 (00:07 -0500)
committerAl Viro <viro@zeniv.linux.org.uk>
Mon, 26 Jan 2015 04:16:29 +0000 (23:16 -0500)
there will be one more change of ->kill() calling conventions; this
isn't final.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
fs/fs_pin.c
kernel/acct.c

index f173313..5eb39a9 100644 (file)
@@ -34,12 +34,6 @@ void mnt_pin_kill(struct mount *m)
                        break;
                }
                pin = hlist_entry(p, struct fs_pin, m_list);
-               if (!atomic_long_inc_not_zero(&pin->count)) {
-                       rcu_read_unlock();
-                       cpu_relax();
-                       continue;
-               }
-               rcu_read_unlock();
                pin->kill(pin);
        }
 }
@@ -56,12 +50,6 @@ void sb_pin_kill(struct super_block *sb)
                        break;
                }
                pin = hlist_entry(p, struct fs_pin, s_list);
-               if (!atomic_long_inc_not_zero(&pin->count)) {
-                       rcu_read_unlock();
-                       cpu_relax();
-                       continue;
-               }
-               rcu_read_unlock();
                pin->kill(pin);
        }
 }
diff --cc kernel/acct.c
Simple merge