Skip to content

Commit

Permalink
proc: In proc_prune_siblings_dcache cache an aquired super block
Browse files Browse the repository at this point in the history
Because there are likely to be several sysctls in a row on the
same superblock cache the super_block after the count has
been raised and don't deactivate it until we are processing
another super_block.

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
  • Loading branch information
Eric W. Biederman committed Feb 21, 2020
1 parent 26dbc60 commit 080f627
Showing 1 changed file with 10 additions and 4 deletions.
14 changes: 10 additions & 4 deletions fs/proc/inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -108,10 +108,11 @@ void proc_prune_siblings_dcache(struct hlist_head *inodes, spinlock_t *lock)
struct inode *inode;
struct proc_inode *ei;
struct hlist_node *node;
struct super_block *sb;
struct super_block *old_sb = NULL;

rcu_read_lock();
for (;;) {
struct super_block *sb;
node = hlist_first_rcu(inodes);
if (!node)
break;
Expand All @@ -122,23 +123,28 @@ void proc_prune_siblings_dcache(struct hlist_head *inodes, spinlock_t *lock)

inode = &ei->vfs_inode;
sb = inode->i_sb;
if (!atomic_inc_not_zero(&sb->s_active))
if ((sb != old_sb) && !atomic_inc_not_zero(&sb->s_active))
continue;
inode = igrab(inode);
rcu_read_unlock();
if (sb != old_sb) {
if (old_sb)
deactivate_super(old_sb);
old_sb = sb;
}
if (unlikely(!inode)) {
deactivate_super(sb);
rcu_read_lock();
continue;
}

d_prune_aliases(inode);
iput(inode);
deactivate_super(sb);

rcu_read_lock();
}
rcu_read_unlock();
if (old_sb)
deactivate_super(old_sb);
}

static int proc_show_options(struct seq_file *seq, struct dentry *root)
Expand Down

0 comments on commit 080f627

Please sign in to comment.