jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-19 07:20:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

namei: Limit traversal when removing data dirs

Browse Source 
namei_RemoveDataDirectories currently calls delTree with 'tree'
pointing to the part of the path immediately following n_base (i.e.
starting at the beginning of n_voldir1). This causes delTree to
traverse all of n_voldir1, trying to delete every directory it finds.

Since we are typically only trying to remove a single volume when
calling namei_RemoveDataDirectories, instead call delTree with 'tree'
pointing to immediately after n_voldir1, and beginning at n_voldir2
and try to just rmdir n_voldir1 afterwards. This way, we do not
traverse a large fraction of the entire partition when just trying to
delete a single volume, and so can significantly speed up volume
removals.

Change-Id: I79d69e7f3d1b691ec1d55e02ee5e93c0a927cffe
Reviewed-on: http://gerrit.openafs.org/2651
Tested-by: Andrew Deason <adeason@sinenomine.net>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
This commit is contained in:
Andrew Deason 2010-09-02 15:05:21 -05:00 committed by Derrick Brashear
parent 41acfb91fa
commit 1ca0a24775
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/vol/namei_ops.c
View File

@ -415,15 +415,29 @@ namei_RemoveDataDirectories(namei_t * name)
{ {
char pbuf[MAXPATHLEN], *path = pbuf; char pbuf[MAXPATHLEN], *path = pbuf;
int prefixlen = strlen(name->n_base), err = 0; int prefixlen = strlen(name->n_base), err = 0;
int vollen = strlen(name->n_voldir1);
int code, code2;
strlcpy(path, name->n_path, sizeof(pbuf)); strlcpy(path, name->n_path, sizeof(pbuf));
/* move past the prefix */ /* move past the prefix and n_voldir1 */
path = path + prefixlen + 1; /* skip over the trailing / */ path = path + prefixlen + 1 + vollen + 1; /* skip over the trailing / */
/* now delete all dirs upto path */ /* now delete all dirs upto path */
return delTree(pbuf, path, &err); code = delTree(pbuf, path, &err);
/* We deleted everything under /n_base/n_voldir1/n_voldir2 if we could,
* but now try to rmdir /n_base/n_voldir1 if we can. delTree modified
* pbuf, so just reconstruct /n_base/n_voldir1 from scratch oureslves. */
afs_snprintf(pbuf, sizeof(pbuf)-1, "%s/%s", name->n_base, name->n_voldir1);
pbuf[sizeof(pbuf)-1] = '\0';
code2 = rmdir(pbuf);
if (!code) {
code = code2;
}
return code;
} }
/* Create the file in the name space. /* Create the file in the name space.