summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWeston Andros Adamson <dros@netapp.com>2013-10-21 13:10:11 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-11-29 11:11:48 -0800
commita5178adbeda8c532361fd22a6dff3bf699ab8b13 (patch)
treeb8e7b16491c421794f8ecf0d96a0fa1c8cb131a8
parent84febe04c528ef627da6962169e7ae324a0a2b99 (diff)
downloadlinux-3.10-a5178adbeda8c532361fd22a6dff3bf699ab8b13.tar.gz
linux-3.10-a5178adbeda8c532361fd22a6dff3bf699ab8b13.tar.bz2
linux-3.10-a5178adbeda8c532361fd22a6dff3bf699ab8b13.zip
NFSv4: don't fail on missing fattr in open recover
commit a43ec98b72aae3e330f0673438f58316c3769b84 upstream. This is an unneeded check that could cause the client to fail to recover opens. Signed-off-by: Weston Andros Adamson <dros@netapp.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--fs/nfs/nfs4proc.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 6af08f36bd8..2e230830ff2 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -1165,12 +1165,6 @@ _nfs4_opendata_reclaim_to_nfs4_state(struct nfs4_opendata *data)
goto err;
}
- ret = -ESTALE;
- if (!(data->f_attr.valid & NFS_ATTR_FATTR_TYPE) ||
- !(data->f_attr.valid & NFS_ATTR_FATTR_FILEID) ||
- !(data->f_attr.valid & NFS_ATTR_FATTR_CHANGE))
- goto err;
-
ret = -ENOMEM;
state = nfs4_get_open_state(inode, data->owner);
if (state == NULL)