From f8818eb569d1da05a157f31bbcc927e028372a33 Mon Sep 17 00:00:00 2001 From: Andrew Deason Date: Wed, 14 Dec 2011 14:42:08 -0600 Subject: [PATCH] afs: Clear VHardMount on ResetVolumeInfo afs_Analyze sets VHardMount on a volume struct when a hard-mount scenario is encountered, and clears it after sleeping. However, if the volume struct has VRecheck set, or if it's not in memory, afs_Analyze cannot retrieve the volume struct in order to clear VHardMount again. For the VRecheck case, this can results in VHardMount never getting cleared, and so hard-mount messages for the volume seem to disappear. So, clear VHardMount when we set VRecheck so this does not occur. For the case where the volume struct is not in memory, this is not a problem, since when we allocate a volume struct again, the VHardMount state will not be retained. Reviewed-on: http://gerrit.openafs.org/6335 Reviewed-by: Derrick Brashear Tested-by: BuildBot (cherry picked from commit f469be407789e696c0b9e9a431b4879798a00e2a) Change-Id: If13769445f20336dfba9755f3af0a1499ce16a6d Reviewed-on: http://gerrit.openafs.org/6348 Reviewed-by: Derrick Brashear Tested-by: Derrick Brashear --- src/afs/afs_volume.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/afs/afs_volume.c b/src/afs/afs_volume.c index 3ca2d492e..94a806e12 100644 --- a/src/afs/afs_volume.c +++ b/src/afs/afs_volume.c @@ -1194,6 +1194,11 @@ afs_ResetVolumeInfo(struct volume *tv) AFS_STATCNT(afs_ResetVolumeInfo); ObtainWriteLock(&tv->lock, 117); tv->states |= VRecheck; + + /* the hard-mount code in afs_Analyze may not be able to reset this flag + * when VRecheck is set, so clear it here to ensure it gets cleared. */ + tv->states &= ~VHardMount; + for (i = 0; i < AFS_MAXHOSTS; i++) tv->status[i] = not_busy; if (tv->name) { -- 2.39.5