NFS: Return valid errors from nfs2/3_decode_dirent()

[sfrench/cifs-2.6.git] / fs / nfs / nfs3xdr.c

diff --git a/fs/nfs/nfs3xdr.c b/fs/nfs/nfs3xdr.c
index 9274c9c5efea63e073acf0c5cff2b744a124a944..7ab60ad98776fb35a52ff63b9b1b015ae94495ae 100644 (file)
--- a/fs/nfs/nfs3xdr.c
+++ b/fs/nfs/nfs3xdr.c
@@ -1967,7 +1967,6 @@ int nfs3_decode_dirent(struct xdr_stream *xdr, struct nfs_entry *entry,
                       bool plus)
 {
        struct user_namespace *userns = rpc_userns(entry->server->client);
-       struct nfs_entry old = *entry;
        __be32 *p;
        int error;
        u64 new_cookie;
@@ -1987,15 +1986,15 @@ int nfs3_decode_dirent(struct xdr_stream *xdr, struct nfs_entry *entry,
 
        error = decode_fileid3(xdr, &entry->ino);
        if (unlikely(error))
-               return error;
+               return -EAGAIN;
 
        error = decode_inline_filename3(xdr, &entry->name, &entry->len);
        if (unlikely(error))
-               return error;
+               return -EAGAIN;
 
        error = decode_cookie3(xdr, &new_cookie);
        if (unlikely(error))
-               return error;
+               return -EAGAIN;
 
        entry->d_type = DT_UNKNOWN;
 
@@ -2003,7 +2002,7 @@ int nfs3_decode_dirent(struct xdr_stream *xdr, struct nfs_entry *entry,
                entry->fattr->valid = 0;
                error = decode_post_op_attr(xdr, entry->fattr, userns);
                if (unlikely(error))
-                       return error;
+                       return -EAGAIN;
                if (entry->fattr->valid & NFS_ATTR_FATTR_V3)
                        entry->d_type = nfs_umode_to_dtype(entry->fattr->mode);
 
@@ -2018,11 +2017,8 @@ int nfs3_decode_dirent(struct xdr_stream *xdr, struct nfs_entry *entry,
                        return -EAGAIN;
                if (*p != xdr_zero) {
                        error = decode_nfs_fh3(xdr, entry->fh);
-                       if (unlikely(error)) {
-                               if (error == -E2BIG)
-                                       goto out_truncated;
-                               return error;
-                       }
+                       if (unlikely(error))
+                               return -EAGAIN;
                } else
                        zero_nfs_fh3(entry->fh);
        }
@@ -2031,11 +2027,6 @@ int nfs3_decode_dirent(struct xdr_stream *xdr, struct nfs_entry *entry,
        entry->cookie = new_cookie;
 
        return 0;
-
-out_truncated:
-       dprintk("NFS: directory entry contains invalid file handle\n");
-       *entry = old;
-       return -EAGAIN;
 }
 
 /*
@@ -2228,6 +2219,7 @@ static int decode_fsinfo3resok(struct xdr_stream *xdr,
        /* ignore properties */
        result->lease_time = 0;
        result->change_attr_type = NFS4_CHANGE_TYPE_IS_UNDEFINED;
+       result->xattr_support = 0;
        return 0;
 }