[SCM] Samba Shared Repository - branch master updated

[Martin Schwenke]

The branch, master has been updated
       via  43cacaad571 ctdb: Fix a typo
       via  bb1e32297ef ctdb: Slightly simplify ctdb_ltdb_lock_fetch_requeue
      from  b7028c42462 torture: Add test for talloc size accounting in memcache

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 43cacaad5715d481327064b0602c93f93954561d
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Apr 4 16:33:22 2019 +0200

    ctdb: Fix a typo
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Martin Schwenke <martin at meltin.net>
    
    Autobuild-User(master): Martin Schwenke <martins at samba.org>
    Autobuild-Date(master): Sat Apr  6 11:51:55 UTC 2019 on sn-devel-144

commit bb1e32297efb8a24cfce945c2e474fb16e1bbea7
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Jan 18 16:50:22 2019 +0100

    ctdb: Slightly simplify ctdb_ltdb_lock_fetch_requeue
    
    Reduce indentation with an early return
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Martin Schwenke <martin at meltin.net>

-----------------------------------------------------------------------

Summary of changes:
 ctdb/server/ctdb_ltdb_server.c | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)


Changeset truncated at 500 lines:

diff --git a/ctdb/server/ctdb_ltdb_server.c b/ctdb/server/ctdb_ltdb_server.c
index 2d1daafb157..91064d19b73 100644
--- a/ctdb/server/ctdb_ltdb_server.c
+++ b/ctdb/server/ctdb_ltdb_server.c
@@ -373,14 +373,17 @@ int ctdb_ltdb_lock_fetch_requeue(struct ctdb_db_context *ctdb_db,
 
 	ret = ctdb_ltdb_lock_requeue(ctdb_db, key, hdr, recv_pkt, 
 				     recv_context, ignore_generation);
-	if (ret == 0) {
-		ret = ctdb_ltdb_fetch(ctdb_db, key, header, hdr, data);
-		if (ret != 0) {
-			int uret;
-			uret = ctdb_ltdb_unlock(ctdb_db, key);
-			if (uret != 0) {
-				DEBUG(DEBUG_ERR,(__location__ " ctdb_ltdb_unlock() failed with error %d\n", uret));
-			}
+	if (ret != 0) {
+		return ret;
+	}
+
+	ret = ctdb_ltdb_fetch(ctdb_db, key, header, hdr, data);
+	if (ret != 0) {
+		int uret;
+		uret = ctdb_ltdb_unlock(ctdb_db, key);
+		if (uret != 0) {
+			DBG_ERR("ctdb_ltdb_unlock() failed with error %d\n",
+				uret);
 		}
 	}
 	return ret;
@@ -388,7 +391,7 @@ int ctdb_ltdb_lock_fetch_requeue(struct ctdb_db_context *ctdb_db,
 
 
 /*
-  paraoid check to see if the db is empty
+  paranoid check to see if the db is empty
  */
 static void ctdb_check_db_empty(struct ctdb_db_context *ctdb_db)
 {


-- 
Samba Shared Repository