From: NeilBrown It's not necessarily correct to assume that the xdr_buf used to hold the server's reply must have page data whenever it has tail data. And there's no need for us to deal with that case separately anyway. Acked-by: "J. Bruce Fields" Signed-off-by: Neil Brown Cc: Signed-off-by: Andrew Morton --- net/sunrpc/auth_gss/svcauth_gss.c | 8 +------- 1 files changed, 1 insertion(+), 7 deletions(-) diff -puN net/sunrpc/auth_gss/svcauth_gss.c~knfsd-rpc-fix-server-side-wrapping-of-krb5i-replies net/sunrpc/auth_gss/svcauth_gss.c --- a/net/sunrpc/auth_gss/svcauth_gss.c~knfsd-rpc-fix-server-side-wrapping-of-krb5i-replies +++ a/net/sunrpc/auth_gss/svcauth_gss.c @@ -1210,13 +1210,7 @@ svcauth_gss_wrap_resp_integ(struct svc_r if (xdr_buf_subsegment(resbuf, &integ_buf, integ_offset, integ_len)) BUG(); - if (resbuf->page_len == 0 - && resbuf->head[0].iov_len + RPC_MAX_AUTH_SIZE - < PAGE_SIZE) { - BUG_ON(resbuf->tail[0].iov_len); - /* Use head for everything */ - resv = &resbuf->head[0]; - } else if (resbuf->tail[0].iov_base == NULL) { + if (resbuf->tail[0].iov_base == NULL) { if (resbuf->head[0].iov_len + RPC_MAX_AUTH_SIZE > PAGE_SIZE) goto out_err; resbuf->tail[0].iov_base = resbuf->head[0].iov_base _