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

autofs4: use helper functions for expiring list 



Define some simple helper functions for adding and deleting entries on the
expiring dentry list.

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 4f8427d1

fs/autofs4/autofs_i.h

+26 −0
Original line number Diff line number Diff line
@@ -266,5 +266,31 @@ out: 
	return ret;

}



static inline void autofs4_add_expiring(struct dentry *dentry)

{

	struct autofs_sb_info *sbi = autofs4_sbi(dentry->d_sb);

	struct autofs_info *ino = autofs4_dentry_ino(dentry);

	if (ino) {

		spin_lock(&sbi->lookup_lock);

		if (list_empty(&ino->expiring))

			list_add(&ino->expiring, &sbi->expiring_list);

		spin_unlock(&sbi->lookup_lock);

	}

	return;

}



static inline void autofs4_del_expiring(struct dentry *dentry)

{

	struct autofs_sb_info *sbi = autofs4_sbi(dentry->d_sb);

	struct autofs_info *ino = autofs4_dentry_ino(dentry);

	if (ino) {

		spin_lock(&sbi->lookup_lock);

		if (!list_empty(&ino->expiring))

			list_del_init(&ino->expiring);

		spin_unlock(&sbi->lookup_lock);

	}

	return;

}



void autofs4_dentry_release(struct dentry *);

extern void autofs4_kill_sb(struct super_block *);

fs/autofs4/root.c

+3 −12
Original line number Diff line number Diff line
@@ -563,10 +563,7 @@ static struct dentry *autofs4_lookup(struct inode *dir, struct dentry *dentry, s 
			 */

			ino = autofs4_dentry_ino(expiring);

			autofs4_expire_wait(expiring);

			spin_lock(&sbi->lookup_lock);

			if (!list_empty(&ino->expiring))

				list_del_init(&ino->expiring);

			spin_unlock(&sbi->lookup_lock);

			autofs4_del_expiring(expiring);

			dput(expiring);

		}
@@ -732,10 +729,7 @@ static int autofs4_dir_unlink(struct inode *dir, struct dentry *dentry) 
	dir->i_mtime = CURRENT_TIME;



	spin_lock(&dcache_lock);

	spin_lock(&sbi->lookup_lock);

	if (list_empty(&ino->expiring))

		list_add(&ino->expiring, &sbi->expiring_list);

	spin_unlock(&sbi->lookup_lock);

	autofs4_add_expiring(dentry);

	spin_lock(&dentry->d_lock);

	__d_drop(dentry);

	spin_unlock(&dentry->d_lock);
@@ -761,10 +755,7 @@ static int autofs4_dir_rmdir(struct inode *dir, struct dentry *dentry) 
		spin_unlock(&dcache_lock);

		return -ENOTEMPTY;

	}

	spin_lock(&sbi->lookup_lock);

	if (list_empty(&ino->expiring))

		list_add(&ino->expiring, &sbi->expiring_list);

	spin_unlock(&sbi->lookup_lock);

	autofs4_add_expiring(dentry);

	spin_lock(&dentry->d_lock);

	__d_drop(dentry);

	spin_unlock(&dentry->d_lock);

CRA Git | Maintained and supported by SUSTech CRA and CCSE