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

Commit e83db167 authored by Miklos Szeredi's avatar Miklos Szeredi Committed by Al Viro
Browse files

vfs: do_last(): clean up labels 



Reported-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarMiklos Szeredi <mszeredi@suse.cz>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent aa4caadb

fs/namei.c

+5 −5
Original line number Diff line number Diff line
@@ -2463,13 +2463,13 @@ static struct file *do_last(struct nameidata *nd, struct path *path, 
			error = -EISDIR;

			goto exit;

		}

		goto ok;

		goto finish_open;

	case LAST_BIND:

		error = complete_walk(nd);

		if (error)

			return ERR_PTR(error);

		audit_inode(pathname, dir);

		goto ok;

		goto finish_open;

	}



	if (!(open_flag & O_CREAT)) {
@@ -2526,7 +2526,7 @@ static struct file *do_last(struct nameidata *nd, struct path *path, 
		will_truncate = 0;

		acc_mode = MAY_OPEN;

		path_to_nameidata(path, nd);

		goto common;

		goto finish_open_created;

	}



	/*
@@ -2598,7 +2598,7 @@ static struct file *do_last(struct nameidata *nd, struct path *path, 
	if ((nd->flags & LOOKUP_DIRECTORY) && !nd->inode->i_op->lookup)

		goto exit;

	audit_inode(pathname, nd->path.dentry);

ok:

finish_open:

	if (!S_ISREG(nd->inode->i_mode))

		will_truncate = 0;
@@ -2608,7 +2608,7 @@ static struct file *do_last(struct nameidata *nd, struct path *path, 
			goto exit;

		want_write = 1;

	}

common:

finish_open_created:

	error = may_open(&nd->path, acc_mode, open_flag);

	if (error)

		goto exit;