From patchwork Thu Aug 23 16:27:49 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Tao X-Patchwork-Id: 1368151 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 A1E06DF2AB for ; Thu, 23 Aug 2012 16:28:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751767Ab2HWQ2h (ORCPT ); Thu, 23 Aug 2012 12:28:37 -0400 Received: from mail-pz0-f46.google.com ([209.85.210.46]:43629 "EHLO mail-pz0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751935Ab2HWQ2g (ORCPT ); Thu, 23 Aug 2012 12:28:36 -0400 Received: by dady13 with SMTP id y13so493174dad.19 for ; Thu, 23 Aug 2012 09:28:36 -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=OUSVcx968gQ/NjWcEgLYKOJidJim9wyj4ky3f5QQtoM=; b=fUx2KFEY7mDWax9mMWYfHMzihw6yYpprz7TwOsdcCl/l2tY0/0/HE8RLK+612Klej9 luhntyfqKVGfmPejElHz6ihyssnhqEvBPJL9E0hA+mp30r1I/K2oyBW1oyOsYsgryADg 6GxQHNfZQixbIw25pYCSl4dOV9x/ZAVfRLKWDQ85fXSKHlr8ii4Qp1pUqUgCH3g7a2zp 1pd9oS/wHkDOHl3FNY42KzNXMChmpvJdCTWReUixKyWE16YwWVKB3KKDrrPCUyEiYVLi R4MSRbTJat/2VGjCx7BXPG+U8i+U+4rxu8leFtru+fxVzyYIuhsir+v64w/j4OZEIgbS mWVQ== Received: by 10.66.74.100 with SMTP id s4mr4557612pav.27.1345739316225; Thu, 23 Aug 2012 09:28:36 -0700 (PDT) Received: from debian-sid.localdomain ([123.118.157.62]) by mx.google.com with ESMTPS id kc7sm6325160pbb.5.2012.08.23.09.28.33 (version=SSLv3 cipher=OTHER); Thu, 23 Aug 2012 09:28:35 -0700 (PDT) From: Peng Tao To: Trond.Myklebust@netapp.com Cc: linux-nfs@vger.kernel.org Subject: [PATCH-resend 2/6] NFS41: fix error of setting blocklayoutdriver Date: Fri, 24 Aug 2012 00:27:49 +0800 Message-Id: <1345739273-2241-3-git-send-email-bergwolf@gmail.com> X-Mailer: git-send-email 1.7.1.262.g5ef3d In-Reply-To: <1345739273-2241-1-git-send-email-bergwolf@gmail.com> References: <1345739273-2241-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: stable [since v3.5] Signed-off-by: Peng Tao --- fs/nfs/client.c | 1 - fs/nfs/nfs4proc.c | 5 ++++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/fs/nfs/client.c b/fs/nfs/client.c index 9969444..0e7cd89 100644 --- a/fs/nfs/client.c +++ b/fs/nfs/client.c @@ -855,7 +855,6 @@ static void nfs_server_set_fsinfo(struct nfs_server *server, if (server->wsize > NFS_MAX_FILE_IO_SIZE) server->wsize = NFS_MAX_FILE_IO_SIZE; server->wpages = (server->wsize + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT; - server->pnfs_blksize = fsinfo->blksize; server->wtmult = nfs_block_bits(fsinfo->wtmult, NULL); diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 6352741..1653091 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; }