smbd: Fix indentation, {} and line length in brl_conflict_other
authorVolker Lendecke <vl@samba.org>
Fri, 11 Jul 2014 11:21:20 +0000 (11 13:21 +0200)
committerStefan Metzmacher <metze@samba.org>
Tue, 22 Jul 2014 13:32:39 +0000 (22 15:32 +0200)
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
source3/locking/brlock.c

index e3f8295..e881b8f 100644 (file)
@@ -227,29 +227,37 @@ static bool brl_conflict1(const struct lock_struct *lck1,
  This is never used in the POSIX lock case.
 ****************************************************************************/
 
-static bool brl_conflict_other(const struct lock_struct *lock, const struct lock_struct *rw_probe)
+static bool brl_conflict_other(const struct lock_struct *lock,
+                              const struct lock_struct *rw_probe)
 {
-       if (IS_PENDING_LOCK(lock->lock_type) || IS_PENDING_LOCK(rw_probe->lock_type))
+       if (IS_PENDING_LOCK(lock->lock_type) ||
+           IS_PENDING_LOCK(rw_probe->lock_type)) {
                return False;
+       }
 
-       if (lock->lock_type == READ_LOCK && rw_probe->lock_type == READ_LOCK)
+       if (lock->lock_type == READ_LOCK && rw_probe->lock_type == READ_LOCK) {
                return False;
+       }
 
        /* POSIX flavour locks never conflict here - this is only called
           in the read/write path. */
 
-       if (lock->lock_flav == POSIX_LOCK && rw_probe->lock_flav == POSIX_LOCK)
+       if (lock->lock_flav == POSIX_LOCK &&
+           rw_probe->lock_flav == POSIX_LOCK) {
                return False;
+       }
 
        /*
         * Incoming WRITE locks conflict with existing READ locks even
         * if the context is the same. JRA. See LOCKTEST7 in smbtorture.
         */
 
-       if (!(rw_probe->lock_type == WRITE_LOCK && lock->lock_type == READ_LOCK)) {
+       if (!(rw_probe->lock_type == WRITE_LOCK &&
+             lock->lock_type == READ_LOCK)) {
                if (brl_same_context(&lock->context, &rw_probe->context) &&
-                                       lock->fnum == rw_probe->fnum)
+                   lock->fnum == rw_probe->fnum) {
                        return False;
+               }
        }
 
        return brl_overlap(lock, rw_probe);