Re: [PATCH 12/13] dcache: remove dentries from LRU before putting ondispose list

[Christoph Hellwig]

> diff --git a/fs/dcache.c b/fs/dcache.c
> index b931415..79bf47c 100644
> --- a/fs/dcache.c
> +++ b/fs/dcache.c
> @@ -269,10 +269,10 @@ static void dentry_lru_move_list(struct dentry *dentry, struct list_head *list)
>  	spin_lock(&dentry->d_sb->s_dentry_lru_lock);
>  	if (list_empty(&dentry->d_lru)) {
>  		list_add_tail(&dentry->d_lru, list);
> -		dentry->d_sb->s_nr_dentry_unused++;
> -		this_cpu_inc(nr_dentry_unused);
>  	} else {
>  		list_move_tail(&dentry->d_lru, list);
> +		dentry->d_sb->s_nr_dentry_unused--;
> +		this_cpu_dec(nr_dentry_unused);
>  	}
>  	spin_unlock(&dentry->d_sb->s_dentry_lru_lock);

I suspect at this point it might be more obvious to simply remove
dentry_lru_move_list.  Just call dentry_lru_del to remove it from the
lru, and then we can add it to the local dispose list without the need
of any locking, similar to how it is done for inodes already.

>  		if (dentry->d_count) {
> -			dentry_lru_del(dentry);
>  			spin_unlock(&dentry->d_lock);
>  			continue;
>  		}
> @@ -789,6 +794,8 @@ relock:
>  			spin_unlock(&dentry->d_lock);
>  		} else {
>  			list_move_tail(&dentry->d_lru, &tmp);
> +			this_cpu_dec(nr_dentry_unused);
> +			sb->s_nr_dentry_unused--;

It might be more obvious to use __dentry_lru_del + an opencoded list_add
here.

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/