[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1338901832-14049-19-git-send-email-miklos@szeredi.hu>
Date: Tue, 5 Jun 2012 15:10:29 +0200
From: Miklos Szeredi <miklos@...redi.hu>
To: viro@...IV.linux.org.uk
Cc: linux-fsdevel@...r.kernel.org, linux-kernel@...r.kernel.org,
hch@...radead.org, torvalds@...ux-foundation.org,
dhowells@...hat.com, mszeredi@...e.cz
Subject: [PATCH 18/21] vfs: do_last(): clean up labels
From: Miklos Szeredi <mszeredi@...e.cz>
Reported-by: David Howells <dhowells@...hat.com>
Signed-off-by: Miklos Szeredi <mszeredi@...e.cz>
---
fs/namei.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/fs/namei.c b/fs/namei.c
index 55f5f27..e57cec2 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -2454,13 +2454,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)) {
@@ -2517,7 +2517,7 @@ retry_lookup:
will_truncate = 0;
acc_mode = MAY_OPEN;
path_to_nameidata(path, nd);
- goto common;
+ goto finish_open_created;
}
/*
@@ -2589,7 +2589,7 @@ finish_lookup:
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;
@@ -2599,7 +2599,7 @@ ok:
goto exit;
want_write = 1;
}
-common:
+finish_open_created:
error = may_open(&nd->path, acc_mode, open_flag);
if (error)
goto exit;
--
1.7.7
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists