]> arthur.barton.de Git - netatalk.git/commitdiff
Fix stamp
authorFrank Lahm <franklahm@googlemail.com>
Wed, 20 Apr 2011 13:20:14 +0000 (15:20 +0200)
committerFrank Lahm <franklahm@googlemail.com>
Wed, 20 Apr 2011 13:20:14 +0000 (15:20 +0200)
etc/cnid_dbd/cmd_dbd_scanvol.c

index 24d51a7198cfead9969d76d9993fffa890567561..1f6c853aaaca5d2634c6cbe0e2f7ff168af3db09 100644 (file)
@@ -1191,15 +1191,16 @@ int cmd_dbd_scanvol(DBD *dbd_ref, struct volinfo *volinfo, dbd_flags_t flags)
         return -1;
     }
 
+    /* Get volume stamp */
+    dbd_getstamp(dbd, &rqst, &rply);
+    if (rply.result != CNID_DBD_RES_OK) {
+        ret = -1;
+        goto exit;
+    }
+    memcpy(stamp, rply.name, CNID_DEV_LEN);
+
     /* temporary rebuild db, used with -re rebuild to delete unused CNIDs, not used with -f */
     if (! nocniddb && (flags & DBD_FLAGS_EXCL) && !(flags & DBD_FLAGS_FORCE)) {
-        /* Get volume stamp */
-        dbd_getstamp(dbd, &rqst, &rply);
-        if (rply.result != CNID_DBD_RES_OK)
-            goto exit;
-        memcpy(stamp, rply.name, CNID_DEV_LEN);
-
-        /* open/create rebuild dbd, copy rootinfo key */
         tmpdb_path = get_tmpdb_path();
         if (NULL == (dbd_rebuild = dbif_init(tmpdb_path, "cnid2.db"))) {
             ret = -1;