From 3df03f0abe3e706eaba57e4d9d8c46f2f4d7414c Mon Sep 17 00:00:00 2001 From: Hartmut Reuter Date: Wed, 5 Oct 2011 10:06:05 -0400 Subject: [PATCH] vol_split: avoid using stale open directory vnodes we could in case of multiple splits end up using a stale open vnode for a directory; attempt to close and thus force-reopen any fdhandles backing ihandles. Change-Id: I50ff39873b523b05287c7a183d84e6f16eb7cd90 Reviewed-on: http://gerrit.openafs.org/5553 Reviewed-by: Hartmut Reuter Tested-by: Derrick Brashear Reviewed-by: Derrick Brashear --- src/volser/vol_split.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/src/volser/vol_split.c b/src/volser/vol_split.c index 5ee2bfbabf..f1a8656bf3 100644 --- a/src/volser/vol_split.c +++ b/src/volser/vol_split.c @@ -247,6 +247,15 @@ copyDir(struct Msg *m, IHandle_t *inh, IHandle_t *outh) return EIO; } outfdP = IH_OPEN(outh); + /* + * In case that a file with the same (NAMEI) name existed before and is still + * open outfdP may point to the wrong (unlinked) file. To make sure we write + * into the correct file it's safer to 1st FDH_REALLYCLOSE it and then to + * re-open it. + */ + if (outfdP) + FDH_REALLYCLOSE(outfdP); + outfdP = IH_OPEN(outh); if (!outfdP) { sprintf(m->line, "Couldn't open output directory %u.%u.%u\n", outfdP->fd_ih->ih_vid, @@ -496,7 +505,7 @@ createMountpoint(Volume *vol, Volume *newvol, struct VnodeDiskObject *parent, afs_int32 code; Inode ino, newino; DirHandle dir; - IHandle_t *h; + IHandle_t *h, *hp; struct VnodeDiskObject vnode; FdHandle_t *fdP, *fdP2; afs_uint64 size; @@ -605,6 +614,13 @@ createMountpoint(Volume *vol, Volume *newvol, struct VnodeDiskObject *parent, code = afs_dir_Create(&dir, name, &fid); FidZap(&dir); + /* Make sure the directory file doesn't remain open */ + IH_INIT(hp, V_device(vol), V_parentId(vol), ino); + fdP = IH_OPEN(hp); + if (fdP) + FDH_REALLYCLOSE(fdP); + IH_RELEASE(hp); + class = vLarge; vcp = &VnodeClassInfo[class]; fdP = IH_OPEN(vol->vnodeIndex[class].handle);