On Saturday 28 May 2011, Rüdiger Meier wrote:
> I could track down the problem to:
>
> commit 0b26a0bf6ff398185546432420bb772bcfdf8d94
> Author: Trond Myklebust <Trond.Myklebust@xxxxxxxxxx>
> Date: Sat Nov 20 14:26:44 2010 -0500
>
> NFS: Ensure we return the dirent->d_type when it is known
>
>
> After reverting the problem is gone.
Actually it's enough to remove d_type from struct nfs_cache_array_entry
again. It's not enough to set it DT_UNKNOWN always. I had to remove it
from struct to let it work.
Tested with kernels 2.6.37.6 and 2.6.39.
commit c9799af304af2a22acffaae25e7e9c3b733a5b68
Author: Ruediger Meier <ruediger.meier@xxxxxxxxxxx>
Date: Sat May 28 15:26:15 2011 +0200
hotfix, opensuse bug 678123
this reverts the effect of 0b26a0bf
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index 7237672..48cfc27 100644
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -202,7 +202,6 @@ struct nfs_cache_array_entry {
u64 cookie;
u64 ino;
struct qstr string;
- unsigned char d_type;
};
struct nfs_cache_array {
@@ -305,7 +304,6 @@ int nfs_readdir_add_to_array(struct nfs_entry
*entry, struct page *page)
cache_entry->cookie = entry->prev_cookie;
cache_entry->ino = entry->ino;
- cache_entry->d_type = entry->d_type;
ret = nfs_readdir_make_qstr(&cache_entry->string, entry->name,
entry->len);
if (ret)
goto out;
@@ -770,7 +768,7 @@ int nfs_do_filldir(nfs_readdir_descriptor_t *desc,
void *dirent,
ent = &array->array[i];
if (filldir(dirent, ent->string.name, ent->string.len,
file->f_pos, nfs_compat_user_ino64(ent->ino),
- ent->d_type) < 0) {
+ DT_UNKNOWN) < 0) {
desc->eof = 1;
break;
}
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
