Re: [PATCH v4 14/32] lock_file(): exit early if lockfile cannot be opened
Reviewed-by: Ronnie Sahlberg <sahlberg@google.com>
On Sat, Sep 6, 2014 at 12:50 AM, Michael Haggerty <mhagger@alum.mit.edu> wrote:
Show 50 quoted lines
> This is a bit easier to read than the old version, which nested part
> of the non-error code in an "if" block.
>
> Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
> ---
> lockfile.c | 23 +++++++++++------------
> 1 file changed, 11 insertions(+), 12 deletions(-)
>
> diff --git a/lockfile.c b/lockfile.c
> index bfea333..71786c9 100644
> --- a/lockfile.c
> +++ b/lockfile.c
> @@ -207,19 +207,18 @@ static int lock_file(struct lock_file *lk, const char *path, int flags)
> resolve_symlink(lk->filename, max_path_len);
> strcat(lk->filename, LOCK_SUFFIX);
> lk->fd = open(lk->filename, O_RDWR | O_CREAT | O_EXCL, 0666);
> - if (0 <= lk->fd) {
> - lk->owner = getpid();
> - if (adjust_shared_perm(lk->filename)) {
> - int save_errno = errno;
> - error("cannot fix permission bits on %s",
> - lk->filename);
> - rollback_lock_file(lk);
> - errno = save_errno;
> - return -1;
> - }
> - }
> - else
> + if (lk->fd < 0) {
> lk->filename[0] = 0;
> + return -1;
> + }
> + lk->owner = getpid();
> + if (adjust_shared_perm(lk->filename)) {
> + int save_errno = errno;
> + error("cannot fix permission bits on %s", lk->filename);
> + rollback_lock_file(lk);
> + errno = save_errno;
> + return -1;
> + }
> return lk->fd;
> }
>
> --
> 2.1.0
>
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.htmlRonnie Sahlberg <sahlberg@google.com>