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

Commit 24ca2af1 authored by Miklos Szeredi's avatar Miklos Szeredi Committed by Linus Torvalds
Browse files

[PATCH] namespace.c: split mark_mounts_for_expiry() 



This patch splits the mark_mounts_for_expiry() function.  It's too complex and
too deeply nested, even without the bugfix in the following patch.

Otherwise code is completely the same.

Signed-off-by: default avatarMiklos Szeredi <miklos@szeredi.hu>
Cc: <viro@parcelfarce.linux.theplanet.co.uk>
Acked-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent a4d70278

fs/namespace.c

+39 −32
Original line number Diff line number Diff line
@@ -825,6 +825,44 @@ int do_add_mount(struct vfsmount *newmnt, struct nameidata *nd, 


EXPORT_SYMBOL_GPL(do_add_mount);



static void expire_mount(struct vfsmount *mnt, struct list_head *mounts)

{

	spin_lock(&vfsmount_lock);



	/*

	 * Check that it is still dead: the count should now be 2 - as

	 * contributed by the vfsmount parent and the mntget above

	 */

	if (atomic_read(&mnt->mnt_count) == 2) {

		struct nameidata old_nd;



		/* delete from the namespace */

		list_del_init(&mnt->mnt_list);

		detach_mnt(mnt, &old_nd);

		spin_unlock(&vfsmount_lock);

		path_release(&old_nd);



		/*

		 * Now lay it to rest if this was the last ref on the superblock

		 */

		if (atomic_read(&mnt->mnt_sb->s_active) == 1) {

			/* last instance - try to be smart */

			lock_kernel();

			DQUOT_OFF(mnt->mnt_sb);

			acct_auto_close(mnt->mnt_sb);

			unlock_kernel();

		}

		mntput(mnt);

	} else {

		/*

		 * Someone brought it back to life whilst we didn't have any

		 * locks held so return it to the expiration list

		 */

		list_add_tail(&mnt->mnt_fslink, mounts);

		spin_unlock(&vfsmount_lock);

	}

}



/*

 * process a list of expirable mountpoints with the intent of discarding any

 * mountpoints that aren't in use and haven't been touched since last we came
@@ -875,38 +913,7 @@ void mark_mounts_for_expiry(struct list_head *mounts) 


		spin_unlock(&vfsmount_lock);

		down_write(&namespace->sem);

		spin_lock(&vfsmount_lock);



		/* check that it is still dead: the count should now be 2 - as

		 * contributed by the vfsmount parent and the mntget above */

		if (atomic_read(&mnt->mnt_count) == 2) {

			struct nameidata old_nd;



			/* delete from the namespace */

			list_del_init(&mnt->mnt_list);

			detach_mnt(mnt, &old_nd);

			spin_unlock(&vfsmount_lock);

			path_release(&old_nd);



			/* now lay it to rest if this was the last ref on the

			 * superblock */

			if (atomic_read(&mnt->mnt_sb->s_active) == 1) {

				/* last instance - try to be smart */

				lock_kernel();

				DQUOT_OFF(mnt->mnt_sb);

				acct_auto_close(mnt->mnt_sb);

				unlock_kernel();

			}



			mntput(mnt);

		} else {

			/* someone brought it back to life whilst we didn't

			 * have any locks held so return it to the expiration

			 * list */

			list_add_tail(&mnt->mnt_fslink, mounts);

			spin_unlock(&vfsmount_lock);

		}



		expire_mount(mnt, mounts);

		up_write(&namespace->sem);



		mntput(mnt);