diff options
author | Miklos Szeredi <mszeredi@suse.cz> | 2012-06-05 09:10:29 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-07-14 08:33:21 -0400 |
commit | e83db167229702da0f48957641e0dbf36b2644aa (patch) | |
tree | b249d4125ea6e6961eb080a6faa4149fb309bbe7 /fs/namei.c | |
parent | aa4caadb70b782999ce5d150ac2f4b1d18e2fc75 (diff) |
vfs: do_last(): clean up labels
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>
Diffstat (limited to 'fs/namei.c')
-rw-r--r-- | fs/namei.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/namei.c b/fs/namei.c index 044215a7bb0c..ea24376cfa94 100644 --- a/fs/namei.c +++ b/fs/namei.c | |||
@@ -2463,13 +2463,13 @@ static struct file *do_last(struct nameidata *nd, struct path *path, | |||
2463 | error = -EISDIR; | 2463 | error = -EISDIR; |
2464 | goto exit; | 2464 | goto exit; |
2465 | } | 2465 | } |
2466 | goto ok; | 2466 | goto finish_open; |
2467 | case LAST_BIND: | 2467 | case LAST_BIND: |
2468 | error = complete_walk(nd); | 2468 | error = complete_walk(nd); |
2469 | if (error) | 2469 | if (error) |
2470 | return ERR_PTR(error); | 2470 | return ERR_PTR(error); |
2471 | audit_inode(pathname, dir); | 2471 | audit_inode(pathname, dir); |
2472 | goto ok; | 2472 | goto finish_open; |
2473 | } | 2473 | } |
2474 | 2474 | ||
2475 | if (!(open_flag & O_CREAT)) { | 2475 | if (!(open_flag & O_CREAT)) { |
@@ -2526,7 +2526,7 @@ retry_lookup: | |||
2526 | will_truncate = 0; | 2526 | will_truncate = 0; |
2527 | acc_mode = MAY_OPEN; | 2527 | acc_mode = MAY_OPEN; |
2528 | path_to_nameidata(path, nd); | 2528 | path_to_nameidata(path, nd); |
2529 | goto common; | 2529 | goto finish_open_created; |
2530 | } | 2530 | } |
2531 | 2531 | ||
2532 | /* | 2532 | /* |
@@ -2598,7 +2598,7 @@ finish_lookup: | |||
2598 | if ((nd->flags & LOOKUP_DIRECTORY) && !nd->inode->i_op->lookup) | 2598 | if ((nd->flags & LOOKUP_DIRECTORY) && !nd->inode->i_op->lookup) |
2599 | goto exit; | 2599 | goto exit; |
2600 | audit_inode(pathname, nd->path.dentry); | 2600 | audit_inode(pathname, nd->path.dentry); |
2601 | ok: | 2601 | finish_open: |
2602 | if (!S_ISREG(nd->inode->i_mode)) | 2602 | if (!S_ISREG(nd->inode->i_mode)) |
2603 | will_truncate = 0; | 2603 | will_truncate = 0; |
2604 | 2604 | ||
@@ -2608,7 +2608,7 @@ ok: | |||
2608 | goto exit; | 2608 | goto exit; |
2609 | want_write = 1; | 2609 | want_write = 1; |
2610 | } | 2610 | } |
2611 | common: | 2611 | finish_open_created: |
2612 | error = may_open(&nd->path, acc_mode, open_flag); | 2612 | error = may_open(&nd->path, acc_mode, open_flag); |
2613 | if (error) | 2613 | if (error) |
2614 | goto exit; | 2614 | goto exit; |