Add support for the glibc 'd_type' field in cases where we have the
READDIRPLUS file attribute information available to us in
nfs_do_filldir().
Cheers,
Trond
diff -u --recursive --new-file linux-2.5.29-rdplus5/fs/nfs/dir.c linux-2.5.29-rdplus6/fs/nfs/dir.c
--- linux-2.5.29-rdplus5/fs/nfs/dir.c Sat Jul 27 19:15:41 2002
+++ linux-2.5.29-rdplus6/fs/nfs/dir.c Sat Jul 27 19:15:33 2002
@@ -249,6 +249,24 @@
return res;
}
+static unsigned int nfs_type2dtype[] = {
+ DT_UNKNOWN,
+ DT_REG,
+ DT_DIR,
+ DT_BLK,
+ DT_CHR,
+ DT_LNK,
+ DT_SOCK,
+ DT_UNKNOWN,
+ DT_FIFO
+};
+
+static inline
+unsigned int nfs_type_to_d_type(enum nfs_ftype type)
+{
+ return nfs_type2dtype[type];
+}
+
/*
* Once we've found the start of the dirent within a page: fill 'er up...
*/
@@ -265,11 +283,17 @@
dfprintk(VFS, "NFS: nfs_do_filldir() filling starting @ cookie %Lu\n", (long long)desc->target);
for(;;) {
+ unsigned d_type = DT_UNKNOWN;
/* Note: entry->prev_cookie contains the cookie for
* retrieving the current dirent on the server */
fileid = nfs_fileid_to_ino_t(entry->ino);
+
+ /* Use readdirplus info */
+ if (desc->plus && (entry->fattr->valid & NFS_ATTR_FATTR))
+ d_type = nfs_type_to_d_type(entry->fattr->type);
+
res = filldir(dirent, entry->name, entry->len,
- entry->prev_cookie, fileid, DT_UNKNOWN);
+ entry->prev_cookie, fileid, d_type);
if (res < 0)
break;
file->f_pos = desc->target = entry->cookie;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Tue Jul 30 2002 - 14:00:29 EST