diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-22 08:51:36 +0000 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-22 08:51:36 +0000 |
commit | e624ae8e0d4243e71daedce7570e91290438eaca (patch) | |
tree | e2b9804379a6aab3d2471898d257fe5590feb70c /fs/nfs/nfs4xdr.c | |
parent | drm/i915: Capture interesting display registers on error (diff) | |
parent | Merge remote branch 'linus' into drm-intel-fixes (diff) | |
download | linux-dev-e624ae8e0d4243e71daedce7570e91290438eaca.tar.xz linux-dev-e624ae8e0d4243e71daedce7570e91290438eaca.zip |
Merge branch 'drm-intel-fixes' into drm-intel-next
Conflicts:
drivers/gpu/drm/i915/i915_gem.c
Diffstat (limited to 'fs/nfs/nfs4xdr.c')
-rw-r--r-- | fs/nfs/nfs4xdr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c index f313c4cce7e4..b7a204ff6fe1 100644 --- a/fs/nfs/nfs4xdr.c +++ b/fs/nfs/nfs4xdr.c @@ -4518,7 +4518,7 @@ static int decode_readdir(struct xdr_stream *xdr, struct rpc_rqst *req, struct n xdr_read_pages(xdr, pglen); - return 0; + return pglen; } static int decode_readlink(struct xdr_stream *xdr, struct rpc_rqst *req) |