X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=netatalk.git;a=blobdiff_plain;f=etc%2Fcnid_dbd%2Fcmd_dbd_scanvol.c;h=a91f43716dd196c8a11ba56c8678c501dd8f2c97;hp=b0af191c26d32345051ddc562a9a17201e1807df;hb=3858412d6efa2798fdc9b3f5613275e49dd63513;hpb=ce40a87753e2529265da0f37808d7d41a9a7efdc diff --git a/etc/cnid_dbd/cmd_dbd_scanvol.c b/etc/cnid_dbd/cmd_dbd_scanvol.c index b0af191c..a91f4371 100644 --- a/etc/cnid_dbd/cmd_dbd_scanvol.c +++ b/etc/cnid_dbd/cmd_dbd_scanvol.c @@ -1212,15 +1212,16 @@ int cmd_dbd_scanvol(DBD *dbd_ref, struct volinfo *vi, 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;