From bea2a94610335939d6ef869489ce5bd19d1a11da Mon Sep 17 00:00:00 2001 From: Andrew Deason Date: Tue, 21 Feb 2012 15:28:08 -0600 Subject: [PATCH] salvager: Do not abort on large volume IDs We have already checked that 'vid' is valid; no need to check if it is negative. Also change vid to be a VolumeId. This is partially cherry-picked from 0884e9d0fddf2be81abf6468209048331efa8a1e. The commit 4d691ae10903e01db4d6b24a4eb02da536cadf7c is comprised of changes from both ce5e263b488f8cb85662031ee08eea448dab2d27 and 0884e9d0fddf2be81abf6468209048331efa8a1e, but it missed a few things from 0884e9d0fddf2be81abf6468209048331efa8a1e. This commit brings in the rest of the changes from 0884e9d0fddf2be81abf6468209048331efa8a1e. Change-Id: I8e001bfe81128b2e2214b3b2fa83e4797374022b Reviewed-on: http://gerrit.openafs.org/6778 Tested-by: BuildBot Reviewed-by: Derrick Brashear --- src/vol/salvaged.c | 3 ++- src/vol/salvager.c | 7 ++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/vol/salvaged.c b/src/vol/salvaged.c index 0f3d345eb..cd33dabbf 100644 --- a/src/vol/salvaged.c +++ b/src/vol/salvaged.c @@ -184,7 +184,8 @@ handleit(struct cmd_syndesc *as, void *arock) { struct cmd_item *ti; char pname[100], *temp; - afs_int32 seenpart = 0, seenvol = 0, vid = 0; + afs_int32 seenpart = 0, seenvol = 0; + VolumeId vid = 0; struct cmdline_rock *rock = (struct cmdline_rock *)arock; #ifdef AFS_SGI_VNODE_GLUE diff --git a/src/vol/salvager.c b/src/vol/salvager.c index dd5727332..16eeac2f2 100644 --- a/src/vol/salvager.c +++ b/src/vol/salvager.c @@ -133,7 +133,8 @@ handleit(struct cmd_syndesc *as, void *arock) { struct cmd_item *ti; char pname[100], *temp; - afs_int32 seenpart = 0, seenvol = 0, vid = 0; + afs_int32 seenpart = 0, seenvol = 0; + VolumeId vid = 0; ProgramType pt; #ifdef FAST_RESTART @@ -384,10 +385,6 @@ handleit(struct cmd_syndesc *as, void *arock) SalvageFileSys(partP, 0); else { /* Salvage individual volume */ - if (vid <= 0) { - Log("salvage: invalid volume id specified; salvage aborted\n"); - Exit(1); - } SalvageFileSys(partP, vid); } } -- 2.39.5