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

Commit 921a1650 authored by Al Viro's avatar Al Viro
Browse files

new helper: done_path_create() 



releases what needs to be released after {kern,user}_path_create()

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 25b2692a

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

+1 −3
Original line number Diff line number Diff line
@@ -70,9 +70,7 @@ static long do_spu_create(const char __user *pathname, unsigned int flags, 
	ret = PTR_ERR(dentry);

	if (!IS_ERR(dentry)) {

		ret = spufs_create(&path, dentry, flags, mode, neighbor);

		mutex_unlock(&path.dentry->d_inode->i_mutex);

		dput(dentry);

		path_put(&path);

		done_path_create(&path, dentry);

	}



	return ret;

drivers/base/devtmpfs.c

+2 −7
Original line number Diff line number Diff line
@@ -156,9 +156,7 @@ static int dev_mkdir(const char *name, umode_t mode) 
	if (!err)

		/* mark as kernel-created inode */

		dentry->d_inode->i_private = &thread;

	dput(dentry);

	mutex_unlock(&path.dentry->d_inode->i_mutex);

	path_put(&path);

	done_path_create(&path, dentry);

	return err;

}
@@ -218,10 +216,7 @@ static int handle_create(const char *nodename, umode_t mode, struct device *dev) 
		/* mark as kernel-created inode */

		dentry->d_inode->i_private = &thread;

	}

	dput(dentry);



	mutex_unlock(&path.dentry->d_inode->i_mutex);

	path_put(&path);

	done_path_create(&path, dentry);

	return err;

}

fs/namei.c

+12 −12
Original line number Diff line number Diff line
@@ -2893,6 +2893,14 @@ struct dentry *kern_path_create(int dfd, const char *pathname, struct path *path 
}

EXPORT_SYMBOL(kern_path_create);



void done_path_create(struct path *path, struct dentry *dentry)

{

	dput(dentry);

	mutex_unlock(&path->dentry->d_inode->i_mutex);

	path_put(path);

}

EXPORT_SYMBOL(done_path_create);



struct dentry *user_path_create(int dfd, const char __user *pathname, struct path *path, int is_dir)

{

	char *tmp = getname(pathname);
@@ -2989,9 +2997,7 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const char __user *, filename, umode_t, mode, 
out_drop_write:

	mnt_drop_write(path.mnt);

out_dput:

	dput(dentry);

	mutex_unlock(&path.dentry->d_inode->i_mutex);

	path_put(&path);

	done_path_create(&path, dentry);



	return error;

}
@@ -3048,9 +3054,7 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const char __user *, pathname, umode_t, mode) 
out_drop_write:

	mnt_drop_write(path.mnt);

out_dput:

	dput(dentry);

	mutex_unlock(&path.dentry->d_inode->i_mutex);

	path_put(&path);

	done_path_create(&path, dentry);

	return error;

}
@@ -3334,9 +3338,7 @@ SYSCALL_DEFINE3(symlinkat, const char __user *, oldname, 
out_drop_write:

	mnt_drop_write(path.mnt);

out_dput:

	dput(dentry);

	mutex_unlock(&path.dentry->d_inode->i_mutex);

	path_put(&path);

	done_path_create(&path, dentry);

out_putname:

	putname(from);

	return error;
@@ -3446,9 +3448,7 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname, 
out_drop_write:

	mnt_drop_write(new_path.mnt);

out_dput:

	dput(new_dentry);

	mutex_unlock(&new_path.dentry->d_inode->i_mutex);

	path_put(&new_path);

	done_path_create(&new_path, new_dentry);

out:

	path_put(&old_path);

fs/ocfs2/refcounttree.c

+1 −3
Original line number Diff line number Diff line
@@ -4477,9 +4477,7 @@ int ocfs2_reflink_ioctl(struct inode *inode, 
				  new_dentry, preserve);

	mnt_drop_write(new_path.mnt);

out_dput:

	dput(new_dentry);

	mutex_unlock(&new_path.dentry->d_inode->i_mutex);

	path_put(&new_path);

	done_path_create(&new_path, new_dentry);

out:

	path_put(&old_path);

include/linux/namei.h

+1 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ extern int kern_path(const char *, unsigned, struct path *); 


extern struct dentry *kern_path_create(int, const char *, struct path *, int);

extern struct dentry *user_path_create(int, const char __user *, struct path *, int);

extern void done_path_create(struct path *, struct dentry *);

extern struct dentry *kern_path_locked(const char *, struct path *);

extern int vfs_path_lookup(struct dentry *, struct vfsmount *,

			   const char *, unsigned int, struct path *);