Re: [PATCH v5 05/35] rollback_lock_file(): set fd to -1

2014-09-17 Thread Michael Haggerty
On 09/16/2014 10:39 PM, Jonathan Nieder wrote: > Jonathan Nieder wrote: >> Michael Haggerty wrote: > >>> --- a/lockfile.c >>> +++ b/lockfile.c >>> @@ -276,7 +276,7 @@ void rollback_lock_file(struct lock_file *lk) >>> return; >>> >>> if (lk->fd >= 0) >>> - close(lk->fd);

Re: [PATCH v5 05/35] rollback_lock_file(): set fd to -1

2014-09-16 Thread Jonathan Nieder
Jonathan Nieder wrote: > Michael Haggerty wrote: >> --- a/lockfile.c >> +++ b/lockfile.c >> @@ -276,7 +276,7 @@ void rollback_lock_file(struct lock_file *lk) >> return; >> >> if (lk->fd >= 0) >> -close(lk->fd); >> +close_lock_file(lk); > > Doesn't need t

Re: [PATCH v5 05/35] rollback_lock_file(): set fd to -1

2014-09-16 Thread Jonathan Nieder
Michael Haggerty wrote: > --- a/lockfile.c > +++ b/lockfile.c > @@ -276,7 +276,7 @@ void rollback_lock_file(struct lock_file *lk) > return; > > if (lk->fd >= 0) > - close(lk->fd); > + close_lock_file(lk); Doesn't need to be guarded by the 'if'. -- To

[PATCH v5 05/35] rollback_lock_file(): set fd to -1

2014-09-16 Thread Michael Haggerty
When rolling back the lockfile, call close_lock_file() so that the lock_file's fd field gets set back to -1. This keeps the lock_file object in a valid state, which is important because these objects are allowed to be reused. Signed-off-by: Michael Haggerty Reviewed-by: Ronnie Sahlberg --- loc