From patchwork Thu Jan 20 19:18:17 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 492461 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p0KJIOFE019503 for ; Thu, 20 Jan 2011 19:18:25 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753995Ab1ATTSX (ORCPT ); Thu, 20 Jan 2011 14:18:23 -0500 Received: from mail-qy0-f181.google.com ([209.85.216.181]:61885 "EHLO mail-qy0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752977Ab1ATTSW (ORCPT ); Thu, 20 Jan 2011 14:18:22 -0500 Received: by qyk12 with SMTP id 12so1000450qyk.19 for ; Thu, 20 Jan 2011 11:18:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:sender:from:subject:to:cc:date:message-id :user-agent:mime-version:content-type:content-transfer-encoding; bh=d271lsjThDMqyxGbfzhxjY1HbL5fax5v8wJaUHGN7AY=; b=NwvnjBIWoiEwTlskUiKxxNJjw7BS5ikoomY5D3DGSnMXCgVt68isbL2YqbpkipgcIp zIE/Os10MsYIfjYM7IoNwDRyO9hX/DSf4drJu0tdDqZHX+EoS2mTU8N2HWrK2jijjU1m /a76zvse7qHOBoV2Anlj1ClF3K+XB0aYpvQpI= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:subject:to:cc:date:message-id:user-agent:mime-version :content-type:content-transfer-encoding; b=IOSChrWYSvlSOXB84G9XCd4o1SzoyqRWyrnHw9MUmXdBTz4Kn/mRSpcbstuQG0UZPH duhOmyI6SiocNqUky5NP9j8MyDqXI4sWYIcMqMfaiysFfZGkGg1sKVVPbLrgPL+j4qq+ Qzb9t5rRuDWBTmD/QDst3oequu7xScHNnDbOE= Received: by 10.229.235.2 with SMTP id ke2mr2014140qcb.285.1295551101157; Thu, 20 Jan 2011 11:18:21 -0800 (PST) Received: from matisse.1015granger.net (adsl-99-26-161-222.dsl.sfldmi.sbcglobal.net [99.26.161.222]) by mx.google.com with ESMTPS id t7sm5913798qcs.16.2011.01.20.11.18.18 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 20 Jan 2011 11:18:19 -0800 (PST) From: Chuck Lever Subject: [PATCH] NFS: Fix "kernel BUG at fs/nfs/nfs3xdr.c:1338!" To: mbroz@redhat.com Cc: linux-kernel@vger.kernel.org, linux-nfs@vger.kernel.org Date: Thu, 20 Jan 2011 14:18:17 -0500 Message-ID: <20110120191639.3122.24837.stgit@matisse.1015granger.net> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Thu, 20 Jan 2011 19:18:25 +0000 (UTC) diff --git a/fs/nfs/nfs3xdr.c b/fs/nfs/nfs3xdr.c index 01c5e8b..183c6b1 100644 --- a/fs/nfs/nfs3xdr.c +++ b/fs/nfs/nfs3xdr.c @@ -1328,10 +1328,13 @@ static void nfs3_xdr_enc_setacl3args(struct rpc_rqst *req, encode_nfs_fh3(xdr, NFS_FH(args->inode)); encode_uint32(xdr, args->mask); + + base = req->rq_slen; if (args->npages != 0) xdr_write_pages(xdr, args->pages, 0, args->len); + else + xdr_reserve_space(xdr, NFS_ACL_INLINE_BUFSIZE); - base = req->rq_slen; error = nfsacl_encode(xdr->buf, base, args->inode, (args->mask & NFS_ACL) ? args->acl_access : NULL, 1, 0);