Commit 840a1bf2 authored Aug 22, 2014 by Bastian Blank Committed by Aneesh Kumar K.V Sep 04, 2014

hw/9pfs: Don't return type from host in readdir on local 9p filesystem



When using mapped mode in 9pfs, readdir implementation
should not return file type in d_type from the host
readdir, instead, it should use the type stored in
the extended attributes.  Since d_type is optional
and reading ext attrs for every readdir is expensive,
it should be sufficient to just set d_type to DT_UNKNOWN,
so guest will know to look it up separately.

This is a -stable material.

Signed-off-by: Bastian Blank <waldi@debian.org>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>

parent f8ad4a89

hw/9pfs/virtio-9p-local.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -397,12 +397,15 @@ static int local_readdir_r(FsContext ctx, V9fsFidOpenState fs,

		again:
		ret = readdir_r(fs->dir, entry, result);
		if (ctx->export_flags & V9FS_SM_MAPPED_FILE) {
		if (ctx->export_flags & V9FS_SM_MAPPED) {
		entry->d_type = DT_UNKNOWN;
		} else if (ctx->export_flags & V9FS_SM_MAPPED_FILE) {
		if (!ret && *result != NULL &&
		!strcmp(entry->d_name, VIRTFS_META_DIR)) {
		/* skp the meta data directory */
		goto again;
		}
		entry->d_type = DT_UNKNOWN;
		}
		return ret;
		}