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

Commit f81a0bff authored by Christoph Hellwig's avatar Christoph Hellwig Committed by David S. Miller
Browse files

[AF_UNIX]: Use lookup_create(). 



currently it opencodes it, but that's in the way of chaning the
lookup_hash interface.

I'd prefer to disallow modular af_unix over exporting lookup_create,
but I'll leave that to you.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2fdba6b0

fs/namei.c

+1 −0
Original line number Diff line number Diff line
@@ -1580,6 +1580,7 @@ struct dentry *lookup_create(struct nameidata *nd, int is_dir) 
fail:

	return dentry;

}

EXPORT_SYMBOL_GPL(lookup_create);



int vfs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t dev)

{

net/unix/af_unix.c

+3 −25
Original line number Diff line number Diff line
@@ -770,33 +770,12 @@ static int unix_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) 
		err = path_lookup(sunaddr->sun_path, LOOKUP_PARENT, &nd);

		if (err)

			goto out_mknod_parent;

		/*

		 * Yucky last component or no last component at all?

		 * (foo/., foo/.., /////)

		 */

		err = -EEXIST;

		if (nd.last_type != LAST_NORM)

			goto out_mknod;

		/*

		 * Lock the directory.

		 */

		down(&nd.dentry->d_inode->i_sem);

		/*

		 * Do the final lookup.

		 */

		dentry = lookup_hash(&nd.last, nd.dentry);



		dentry = lookup_create(&nd, 0);

		err = PTR_ERR(dentry);

		if (IS_ERR(dentry))

			goto out_mknod_unlock;

		err = -ENOENT;

		/*

		 * Special case - lookup gave negative, but... we had foo/bar/

		 * From the vfs_mknod() POV we just have a negative dentry -

		 * all is fine. Let's be bastards - you had / on the end, you've

		 * been asking for (non-existent) directory. -ENOENT for you.

		 */

		if (nd.last.name[nd.last.len] && !dentry->d_inode)

			goto out_mknod_dput;



		/*

		 * All right, let's create it.

		 */
@@ -845,7 +824,6 @@ static int unix_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) 
	dput(dentry);

out_mknod_unlock:

	up(&nd.dentry->d_inode->i_sem);

out_mknod:

	path_release(&nd);

out_mknod_parent:

	if (err==-EEXIST)