better-type-guessing-for-readdir-hint-20010411

instead of just saying unknown, if we know for sure, provide the info

diff --git a/src/afs/LINUX/osi_vnodeops.c b/src/afs/LINUX/osi_vnodeops.c
index 3d71b9df48e00f2a66102e6dab0b986d0eb53597..e89704d725e87f016da850f3f468fd845d834a5e 100644 (file)
--- a/src/afs/LINUX/osi_vnodeops.c
+++ b/src/afs/LINUX/osi_vnodeops.c
@@ -231,7 +231,37 @@ tagain:
 
        /* filldir returns -EINVAL when the buffer is full. */
 #ifdef AFS_LINUX24_ENV
-       code = (*filldir)(dirbuf, de->name, len, offset, ino, DT_UNKNOWN);
+        {
+             unsigned int type=DT_UNKNOWN;
+             struct VenusFid afid;
+             struct vcache *tvc;
+             int vtype;
+             afid.Cell=avc->fid.Cell;
+             afid.Fid.Volume=avc->fid.Fid.Volume;
+             afid.Fid.Vnode=ntohl(de->fid.vnode);
+             afid.Fid.Unique=ntohl(de->fid.vunique);
+             if ((avc->states & CForeign) == 0 &&
+                 (ntohl(de->fid.vnode) & 1)) {
+                  type=DT_DIR;
+             } else if ((tvc=afs_FindVCache(&afid,0,0,0,0))) {
+                  if (tvc->mvstat) {
+                       type=DT_DIR;
+                  } else if (((tvc->states) & (CStatd|CTruth))) {
+                       /* CTruth will be set if the object has 
+                        *ever* been statd */
+                       vtype=vType(tvc);
+                       if (vtype == VDIR)
+                            type=DT_DIR;
+                       else if (vtype == VREG)
+                            type=DT_REG;
+                       /* Don't do this until we're sure it can't be a mtpt */
+                       /* else if (vtype == VLNK)
+                          type=DT_LNK; */
+                       /* what other types does AFS support? */
+                  }
+             }
+             code = (*filldir)(dirbuf, de->name, len, offset, ino, type);
+        }
 #else
        code = (*filldir)(dirbuf, de->name, len, offset, ino); 
 #endif