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

Commit 90387c9c authored by Ian Kent's avatar Ian Kent Committed by Linus Torvalds
Browse files

autofs4: renamer unhashed to active in autofs4_lookup() 



Rename the variable unhashed to active in autofs4_lookup() to better
reflect its usage.

Signed-off-by: default avatarIan Kent <raven@themaw.net>
Cc: Sage Weil <sage@newdream.net>
Cc: Al Viro <viro@ZenIV.linux.org.uk>
Cc: Andreas Dilger <adilger@sun.com>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Yehuda Saheh <yehuda@newdream.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent aa952eb2

fs/autofs4/root.c

+10 −10
Original line number Original line Diff line number Diff line
@@ -514,7 +514,7 @@ static struct dentry *autofs4_lookup(struct inode *dir, struct dentry *dentry, s 
{

{

	struct autofs_sb_info *sbi;

	struct autofs_sb_info *sbi;

	struct autofs_info *ino;

	struct autofs_info *ino;

	struct dentry *expiring, *unhashed;

	struct dentry *expiring, *active;

	int oz_mode;

	int oz_mode;





	DPRINTK("name = %.*s",

	DPRINTK("name = %.*s",
@@ -530,9 +530,9 @@ static struct dentry *autofs4_lookup(struct inode *dir, struct dentry *dentry, s 
	DPRINTK("pid = %u, pgrp = %u, catatonic = %d, oz_mode = %d",

	DPRINTK("pid = %u, pgrp = %u, catatonic = %d, oz_mode = %d",

		 current->pid, task_pgrp_nr(current), sbi->catatonic, oz_mode);

		 current->pid, task_pgrp_nr(current), sbi->catatonic, oz_mode);





	unhashed = autofs4_lookup_active(sbi, dentry->d_parent, &dentry->d_name);

	active = autofs4_lookup_active(sbi, dentry->d_parent, &dentry->d_name);

	if (unhashed) {

	if (active) {

		dentry = unhashed;

		dentry = active;

		ino = autofs4_dentry_ino(dentry);

		ino = autofs4_dentry_ino(dentry);

	} else {

	} else {

		/*

		/*
@@ -600,8 +600,8 @@ static struct dentry *autofs4_lookup(struct inode *dir, struct dentry *dentry, s 
			if (sigismember (sigset, SIGKILL) ||

			if (sigismember (sigset, SIGKILL) ||

			    sigismember (sigset, SIGQUIT) ||

			    sigismember (sigset, SIGQUIT) ||

			    sigismember (sigset, SIGINT)) {

			    sigismember (sigset, SIGINT)) {

			    if (unhashed)

			    if (active)

				dput(unhashed);

				dput(active);

			    return ERR_PTR(-ERESTARTNOINTR);

			    return ERR_PTR(-ERESTARTNOINTR);

			}

			}

		}

		}
@@ -633,14 +633,14 @@ static struct dentry *autofs4_lookup(struct inode *dir, struct dentry *dentry, s 
		else

		else

			dentry = ERR_PTR(-ENOENT);

			dentry = ERR_PTR(-ENOENT);





		if (unhashed)

		if (active)

			dput(unhashed);

			dput(active);





		return dentry;

		return dentry;

	}

	}





	if (unhashed)

	if (active)

		return unhashed;

		return active;





	return NULL;

	return NULL;

}

}