Merge 3.15 branch into 7.0

2021-05-06 12:33:47 -05:00
parent dc03d519fb b55c019f10
commit 6a9d92f8f4
6 changed files with 129 additions and 54 deletions
@@ -1376,7 +1376,8 @@ long dbPut(DBADDR *paddr, short dbrType,
    /* Always do special processing if needed */
    if (special) {
        long status2 = dbPutSpecial(paddr, 1);
-        if (status2) goto done;
+        if (status2)
+            status = status2;
    }
    if (status) goto done;