luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vfs: do_last(): clean up labels

Browse Source 
Reported-by: David Howells <dhowells@redhat.com>
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Miklos Szeredi 2012-06-05 15:10:29 +02:00 committed by Al Viro
parent aa4caadb70
commit e83db16722
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fs/namei.c
View File

@ -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;