From 9fa51694c6a41323cfeb7b41bb4dff9e8dac77be Mon Sep 17 00:00:00 2001 From: Simon Wilkinson Date: Mon, 19 Jan 2009 17:29:08 +0000 Subject: [PATCH] linux-disconnected-avoid-ls-hang-20090119 LICENSE IPL10 FIXES 124152 avoid allowing a non-CStatd vcache to make its way into a readdir which causes an infinite loop --- src/afs/afs_vcache.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/src/afs/afs_vcache.c b/src/afs/afs_vcache.c index 3f76f69ea0..550a905563 100644 --- a/src/afs/afs_vcache.c +++ b/src/afs/afs_vcache.c @@ -2020,16 +2020,9 @@ afs_GetVCache(register struct VenusFid *afid, struct vrequest *areq, } else { if (AFS_IS_DISCONNECTED) { - if (AFS_IS_DISCON_RW) { - if (vType(tvc) == VDIR) - OutStatus.FileType = Directory; - - code = tvc?0:ENOENT; - } else { - /* Nothing to do otherwise...*/ - code = ENETDOWN; - printf("Network is down in afs_GetCache"); - } + /* Nothing to do otherwise...*/ + code = ENETDOWN; + printf("Network is down in afs_GetCache"); } else code = afs_FetchStatus(tvc, afid, areq, &OutStatus); @@ -3288,10 +3281,8 @@ void afs_DisconGiveUpCallbacks() { for (i = 0; i < VCSIZE; i++) { for (tvc = afs_vhashT[i]; tvc; tvc = tvc->hnext) { if ((tvc->states & CRO) == 0 && tvc->callback) { - /* XXX - should we check if the callback has expired here? */ afs_QueueVCB(tvc); tvc->callback = NULL; - tvc->states &- ~(CStatd | CUnique); nq++; } }