Merge from branch-2-1

diff --git a/NEWS b/NEWS
index d9e6bd4562476306be5353968e6cc7cd21ff95b1..9b57c5a438d3d97d249dbdaec848e3567e8024ea 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -21,6 +21,7 @@ Changes in 2.1.4
 * NEW: cnid_metad: use a PID lockfile
 * NEW: afpd: prevent log flooding
 * UPD: dbd: ignore ".zfs" snapshot directories
+* UPD: dbd: support interrupting -re mode
 
 Changes in 2.1.3
 ================

diff --git a/etc/cnid_dbd/cmd_dbd_scanvol.c b/etc/cnid_dbd/cmd_dbd_scanvol.c
index 602953768dc88f116973d15592dcd46a801691ce..edc15bb4975eb86b56a7d06fdee0cc3244462ef8 100644 (file)
--- a/etc/cnid_dbd/cmd_dbd_scanvol.c
+++ b/etc/cnid_dbd/cmd_dbd_scanvol.c
@@ -1048,6 +1048,9 @@ static void delete_orphaned_cnids(DBD *dbd, DBD *dbd_rebuild, dbd_flags_t flags)
 
     /* Start main loop through dbd: get CNID from dbd */
     while ((dbif_idwalk(dbd, &dbd_cnid, 0)) == 1) {
+        /* Check if we got a termination signal */
+        if (alarmed)
+            longjmp(jmp, 1); /* this jumps back to cmd_dbd_scanvol() */
 
         if (deleted > 50) {
             deleted = 0;
@@ -1073,6 +1076,9 @@ static void delete_orphaned_cnids(DBD *dbd, DBD *dbd_rebuild, dbd_flags_t flags)
                         dbif_txn_close(dbd, ret);
                         deleted++;
                     }
+                    /* Check if we got a termination signal */
+                    if (alarmed)
+                        longjmp(jmp, 1); /* this jumps back to cmd_dbd_scanvol() */
                 }
                 return;
             } else