Browse Source

nfsd4: encode_rdattr_error cleanup

There's a simpler way to write this.

Signed-off-by: J. Bruce Fields <bfields@redhat.com>
J. Bruce Fields 12 years ago
parent
commit
87915c6472
1 changed files with 1 additions and 4 deletions
  1. 1 4
      fs/nfsd/nfs4xdr.c

+ 1 - 4
fs/nfsd/nfs4xdr.c

@@ -2620,17 +2620,14 @@ out_put:
 static __be32 *
 static __be32 *
 nfsd4_encode_rdattr_error(__be32 *p, int buflen, __be32 nfserr)
 nfsd4_encode_rdattr_error(__be32 *p, int buflen, __be32 nfserr)
 {
 {
-	__be32 *attrlenp;
-
 	if (buflen < 6)
 	if (buflen < 6)
 		return NULL;
 		return NULL;
 	*p++ = htonl(2);
 	*p++ = htonl(2);
 	*p++ = htonl(FATTR4_WORD0_RDATTR_ERROR); /* bmval0 */
 	*p++ = htonl(FATTR4_WORD0_RDATTR_ERROR); /* bmval0 */
 	*p++ = htonl(0);			 /* bmval1 */
 	*p++ = htonl(0);			 /* bmval1 */
 
 
-	attrlenp = p++;
+	*p++ = htonl(4);     /* attribute length */
 	*p++ = nfserr;       /* no htonl */
 	*p++ = nfserr;       /* no htonl */
-	*attrlenp = htonl((char *)p - (char *)attrlenp - 4);
 	return p;
 	return p;
 }
 }