From patchwork Wed Aug 8 01:49:37 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Tao X-Patchwork-Id: 1291801 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id AD097DF280 for ; Wed, 8 Aug 2012 01:50:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755479Ab2HHBuF (ORCPT ); Tue, 7 Aug 2012 21:50:05 -0400 Received: from mail-gh0-f174.google.com ([209.85.160.174]:35121 "EHLO mail-gh0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754699Ab2HHBuE (ORCPT ); Tue, 7 Aug 2012 21:50:04 -0400 Received: by ghrr11 with SMTP id r11so282185ghr.19 for ; Tue, 07 Aug 2012 18:50:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=Yw2Nz65UWsUmpWKWSlWklPnmMy9zGK0+P5tPFKZ3ovo=; b=s8CkL/frQrxOeRDiczR/tfr1M8wsLkZIaIirO0QhEYgocZYLlIol25YO67htAXHwI4 5r1Bzb1M5032d2O+aioG9xhuNkiXS5WEQz1464WKFMorBSRDsCXCkL1tRuC1Iut7dbR0 FOKDSw0R1+YU12qJVG4V1hjqTjQMKs30rVuSv6I857JjZdjYqZXMbKb02kbTKcMCWxfR m+qanGCCKfgikO+D1dgKumnfDDK7xKZYP2XUsc2XlHdZX0NhtFj5gC/B+7rBvcly1stt 1TCJhMHtnYFc7+i288AVyqGCDyEHFQVJEH8NFTB90UIVrGXs6ct/IRIttR1au4AT42XC YDhg== Received: by 10.66.77.169 with SMTP id t9mr30362106paw.70.1344390603270; Tue, 07 Aug 2012 18:50:03 -0700 (PDT) Received: from debian-sid.localdomain ([123.115.212.137]) by mx.google.com with ESMTPS id rs4sm8840988pbc.0.2012.08.07.18.50.00 (version=SSLv3 cipher=OTHER); Tue, 07 Aug 2012 18:50:02 -0700 (PDT) From: Peng Tao To: Trond.Myklebust@netapp.com Cc: linux-nfs@vger.kernel.org, Bryan Schumaker Subject: [PATCH 2/2] NFS41: fix error of setting blocklayoutdriver Date: Wed, 8 Aug 2012 09:49:37 +0800 Message-Id: <1344390577-1602-2-git-send-email-bergwolf@gmail.com> X-Mailer: git-send-email 1.7.1.262.g5ef3d In-Reply-To: <1344390577-1602-1-git-send-email-bergwolf@gmail.com> References: <1344390577-1602-1-git-send-email-bergwolf@gmail.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org After commit e38eb650 (NFS: set_pnfs_layoutdriver() from nfs4_proc_fsinfo()), set_pnfs_layoutdriver() is called inside nfs4_proc_fsinfo(), but pnfs_blksize is not set. It causes setting blocklayoutdriver failure and pnfsblock mount failure. Cc: Bryan Schumaker Signed-off-by: Peng Tao --- fs/nfs/nfs4proc.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 78b2163..299c311 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -3362,8 +3362,11 @@ static int nfs4_proc_fsinfo(struct nfs_server *server, struct nfs_fh *fhandle, s nfs_fattr_init(fsinfo->fattr); error = nfs4_do_fsinfo(server, fhandle, fsinfo); - if (error == 0) + if (error == 0) { + /* block layout checks this! */ + server->pnfs_blksize = fsinfo->blksize; set_pnfs_layoutdriver(server, fhandle, fsinfo->layouttype); + } return error; }