From e19d160888ffba08447f1d5a3a3bf9dbc64457d8 Mon Sep 17 00:00:00 2001 From: Trond Myklebust Date: Thu, 21 Jun 2012 11:41:29 -0400 Subject: [PATCH] --- yaml --- r: 320186 b: refs/heads/master c: 1aecca3e83e5da981ade916920d3d2a6b9644cc3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/nfs/nfs3xdr.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e42043be2fd0..7b877259d906 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 256e48bb473b631fbb5aa03d6ed38c652ad3caa7 +refs/heads/master: 1aecca3e83e5da981ade916920d3d2a6b9644cc3 diff --git a/trunk/fs/nfs/nfs3xdr.c b/trunk/fs/nfs/nfs3xdr.c index d64a00ff5a16..5013bdd85ab9 100644 --- a/trunk/fs/nfs/nfs3xdr.c +++ b/trunk/fs/nfs/nfs3xdr.c @@ -2341,7 +2341,7 @@ static inline int decode_getacl3resok(struct xdr_stream *xdr, if (result->mask & ~(NFS_ACL|NFS_ACLCNT|NFS_DFACL|NFS_DFACLCNT)) goto out; - hdrlen = (u8 *)xdr->p - (u8 *)xdr->iov->iov_base; + hdrlen = xdr_stream_pos(xdr); acl = NULL; if (result->mask & NFS_ACL)