Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dc0474be authored by Nick Piggin's avatar Nick Piggin
Browse files

fs: dcache rationalise dget variants 



dget_locked was a shortcut to avoid the lazy lru manipulation when we already
held dcache_lock (lru manipulation was relatively cheap at that point).
However, how that the lru lock is an innermost one, we never hold it at any
caller, so the lock cost can now be avoided. We already have well working lazy
dcache LRU, so it should be fine to defer LRU manipulations to scan time.

Signed-off-by: default avatarNick Piggin <npiggin@kernel.dk>
parent 357f8e65

arch/powerpc/platforms/cell/spufs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ static void spufs_prune_dir(struct dentry *dir) 
	list_for_each_entry_safe(dentry, tmp, &dir->d_subdirs, d_u.d_child) {

		spin_lock(&dentry->d_lock);

		if (!(d_unhashed(dentry)) && dentry->d_inode) {

			dget_locked_dlock(dentry);

			dget_dlock(dentry);

			__d_drop(dentry);

			spin_unlock(&dentry->d_lock);

			simple_unlink(dir->d_inode, dentry);

drivers/infiniband/hw/ipath/ipath_fs.c

+1 −1
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ static int remove_file(struct dentry *parent, char *name) 


	spin_lock(&tmp->d_lock);

	if (!(d_unhashed(tmp) && tmp->d_inode)) {

		dget_locked_dlock(tmp);

		dget_dlock(tmp);

		__d_drop(tmp);

		spin_unlock(&tmp->d_lock);

		simple_unlink(parent->d_inode, tmp);

drivers/infiniband/hw/qib/qib_fs.c

+1 −1
Original line number Diff line number Diff line
@@ -455,7 +455,7 @@ static int remove_file(struct dentry *parent, char *name) 


	spin_lock(&tmp->d_lock);

	if (!(d_unhashed(tmp) && tmp->d_inode)) {

		dget_locked_dlock(tmp);

		dget_dlock(tmp);

		__d_drop(tmp);

		spin_unlock(&tmp->d_lock);

		simple_unlink(parent->d_inode, tmp);

drivers/staging/smbfs/cache.c

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ smb_dget_fpos(struct dentry *dentry, struct dentry *parent, unsigned long fpos) 
		dent = list_entry(next, struct dentry, d_u.d_child);

		if ((unsigned long)dent->d_fsdata == fpos) {

			if (dent->d_inode)

				dget_locked(dent);

				dget(dent);

			else

				dent = NULL;

			goto out_unlock;

fs/configfs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -252,7 +252,7 @@ void configfs_drop_dentry(struct configfs_dirent * sd, struct dentry * parent) 
	if (dentry) {

		spin_lock(&dentry->d_lock);

		if (!(d_unhashed(dentry) && dentry->d_inode)) {

			dget_locked_dlock(dentry);

			dget_dlock(dentry);

			__d_drop(dentry);

			spin_unlock(&dentry->d_lock);

			simple_unlink(parent->d_inode, dentry);