|
@@ -6086,11 +6086,11 @@ int nfs4_decode_dirent(struct xdr_stream *xdr, struct nfs_entry *entry,
|
|
|
__be32 *p = xdr_inline_decode(xdr, 4);
|
|
|
if (unlikely(!p))
|
|
|
goto out_overflow;
|
|
|
- if (!ntohl(*p++)) {
|
|
|
+ if (*p == xdr_zero) {
|
|
|
p = xdr_inline_decode(xdr, 4);
|
|
|
if (unlikely(!p))
|
|
|
goto out_overflow;
|
|
|
- if (!ntohl(*p++))
|
|
|
+ if (*p == xdr_zero)
|
|
|
return -EAGAIN;
|
|
|
entry->eof = 1;
|
|
|
return -EBADCOOKIE;
|
|
@@ -6101,7 +6101,7 @@ int nfs4_decode_dirent(struct xdr_stream *xdr, struct nfs_entry *entry,
|
|
|
goto out_overflow;
|
|
|
entry->prev_cookie = entry->cookie;
|
|
|
p = xdr_decode_hyper(p, &entry->cookie);
|
|
|
- entry->len = ntohl(*p++);
|
|
|
+ entry->len = be32_to_cpup(p);
|
|
|
|
|
|
p = xdr_inline_decode(xdr, entry->len);
|
|
|
if (unlikely(!p))
|