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

Commit 718c604a authored by Ian Kent's avatar Ian Kent Committed by Linus Torvalds
Browse files

[PATCH] autofs4: lookup white space cleanup 



Whitespace and formating changes to lookup code.

Signed-off-by: default avatarIan Kent <raven@themaw.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 86c79cbc

fs/autofs4/root.c

+20 −14
Original line number Original line Diff line number Diff line
@@ -296,13 +296,13 @@ static int try_to_fill_dentry(struct vfsmount *mnt, struct dentry *dentry, int f 
{

{

	struct super_block *sb = mnt->mnt_sb;

	struct super_block *sb = mnt->mnt_sb;

	struct autofs_sb_info *sbi = autofs4_sbi(sb);

	struct autofs_sb_info *sbi = autofs4_sbi(sb);

	struct autofs_info *de_info = autofs4_dentry_ino(dentry);

	struct autofs_info *ino = autofs4_dentry_ino(dentry);

	int status = 0;

	int status = 0;





	/* Block on any pending expiry here; invalidate the dentry

	/* Block on any pending expiry here; invalidate the dentry

           when expiration is done to trigger mount request with a new

           when expiration is done to trigger mount request with a new

           dentry */

           dentry */

	if (de_info && (de_info->flags & AUTOFS_INF_EXPIRING)) {

	if (ino && (ino->flags & AUTOFS_INF_EXPIRING)) {

		DPRINTK("waiting for expire %p name=%.*s",

		DPRINTK("waiting for expire %p name=%.*s",

			 dentry, dentry->d_name.len, dentry->d_name.name);

			 dentry, dentry->d_name.len, dentry->d_name.name);
@@ -323,7 +323,10 @@ static int try_to_fill_dentry(struct vfsmount *mnt, struct dentry *dentry, int f 
	DPRINTK("dentry=%p %.*s ino=%p",

	DPRINTK("dentry=%p %.*s ino=%p",

		 dentry, dentry->d_name.len, dentry->d_name.name, dentry->d_inode);

		 dentry, dentry->d_name.len, dentry->d_name.name, dentry->d_inode);





	/* Wait for a pending mount, triggering one if there isn't one already */

	/*

	 * Wait for a pending mount, triggering one if there

	 * isn't one already

	 */

	if (dentry->d_inode == NULL) {

	if (dentry->d_inode == NULL) {

		DPRINTK("waiting for mount name=%.*s",

		DPRINTK("waiting for mount name=%.*s",

			 dentry->d_name.len, dentry->d_name.name);

			 dentry->d_name.len, dentry->d_name.name);
@@ -367,8 +370,10 @@ static int try_to_fill_dentry(struct vfsmount *mnt, struct dentry *dentry, int f 
		}

		}

	}

	}





	/* We don't update the usages for the autofs daemon itself, this

	/*

	   is necessary for recursive autofs mounts */

	 * We don't update the usages for the autofs daemon itself, this

	 * is necessary for recursive autofs mounts

	 */

	if (!autofs4_oz_mode(sbi))

	if (!autofs4_oz_mode(sbi))

		autofs4_update_usage(mnt, dentry);

		autofs4_update_usage(mnt, dentry);
@@ -462,12 +467,13 @@ static struct dentry *autofs4_lookup(struct inode *dir, struct dentry *dentry, s 
	DPRINTK("name = %.*s",

	DPRINTK("name = %.*s",

		dentry->d_name.len, dentry->d_name.name);

		dentry->d_name.len, dentry->d_name.name);





	/* File name too long to exist */

	if (dentry->d_name.len > NAME_MAX)

	if (dentry->d_name.len > NAME_MAX)

		return ERR_PTR(-ENAMETOOLONG);/* File name too long to exist */

		return ERR_PTR(-ENAMETOOLONG);





	sbi = autofs4_sbi(dir->i_sb);

	sbi = autofs4_sbi(dir->i_sb);



	oz_mode = autofs4_oz_mode(sbi);

	oz_mode = autofs4_oz_mode(sbi);



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

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

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

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