diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2011-07-30 12:45:35 -0400 |
|---|---|---|
| committer | Jonas ABERG <jonas.aberg@stericsson.com> | 2011-10-28 11:14:32 +0200 |
| commit | c33192008ee6eb8c8a7480f714f68fdcb46a4504 (patch) | |
| tree | 84ec9fc8b6d2be69689905c4b84f8111d28fa4a1 /include/linux/nfs_fs.h | |
| parent | 9f0e0f4ec5ac79f60d0f75c3f9f9e06f9803aa27 (diff) | |
NFS: Fix spurious readdir cookie loop messages
commit 0c0308066ca53fdf1423895f3a42838b67b3a5a8 upstream.
If the directory contents change, then we have to accept that the
file->f_pos value may shrink if we do a 'search-by-cookie'. In that
case, we should turn off the loop detection and let the NFS client
try to recover.
The patch also fixes a second loop detection bug by ensuring
that after turning on the ctx->duped flag, we read at least one new
cookie into ctx->dir_cookie before attempting to match with
ctx->dup_cookie.
Reported-by: Petr Vandrovec <petr@vandrovec.name>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Change-Id: Ibe4963eb5f9f34251713f1e5776d6b409e04616a
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35658
Tested-by: Per VAHLNE <per.xx.vahlne@stericsson.com>
Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
Diffstat (limited to 'include/linux/nfs_fs.h')
| -rw-r--r-- | include/linux/nfs_fs.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h index 1b93b9c60e5..b522370fcc2 100644 --- a/include/linux/nfs_fs.h +++ b/include/linux/nfs_fs.h @@ -99,9 +99,10 @@ struct nfs_open_context { struct nfs_open_dir_context { struct rpc_cred *cred; + unsigned long attr_gencount; __u64 dir_cookie; __u64 dup_cookie; - int duped; + signed char duped; }; /* |