From patchwork Tue Jun 7 17:32:22 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Rees X-Patchwork-Id: 858452 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 p57HW4Ec020963 for ; Tue, 7 Jun 2011 17:32:25 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752067Ab1FGRcZ (ORCPT ); Tue, 7 Jun 2011 13:32:25 -0400 Received: from int-mailstore01.merit.edu ([207.75.116.232]:51453 "EHLO int-mailstore01.merit.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755451Ab1FGRcY (ORCPT ); Tue, 7 Jun 2011 13:32:24 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by int-mailstore01.merit.edu (Postfix) with ESMTP id 3773530852D5; Tue, 7 Jun 2011 13:32:24 -0400 (EDT) X-Virus-Scanned: amavisd-new at int-mailstore01.merit.edu Received: from int-mailstore01.merit.edu ([127.0.0.1]) by localhost (int-mailstore01.merit.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id M8v-eTgb7Jt3; Tue, 7 Jun 2011 13:32:23 -0400 (EDT) Received: from merit.edu (host-17.subnet-17.med.umich.edu [141.214.17.17]) by int-mailstore01.merit.edu (Postfix) with ESMTPSA id 7B00830852CE; Tue, 7 Jun 2011 13:32:23 -0400 (EDT) Date: Tue, 7 Jun 2011 13:32:22 -0400 From: Jim Rees To: Benny Halevy Cc: linux-nfs@vger.kernel.org, peter honeyman Subject: [PATCH 53/88] SQUASHME: pnfsblock: set pnfs_blksize before calling set_pnfs_layoutdriver Message-ID: <42fb2e3c62b48871bbc27b72dc98f49ee49a412f.1307464382.git.rees@umich.edu> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: 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]); Tue, 07 Jun 2011 17:32:25 +0000 (UTC) From: Zhang Jingwang For block/volume layout driver, set_pnfs_layoutdriver will call initialize_mountpoint() which will check the value of pnfs_blksize. Signed-off-by: Zhang Jingwang Signed-off-by: Benny Halevy --- fs/nfs/client.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/fs/nfs/client.c b/fs/nfs/client.c index 6c6236b..b2c6920 100644 --- a/fs/nfs/client.c +++ b/fs/nfs/client.c @@ -937,8 +937,8 @@ static void nfs_server_set_fsinfo(struct nfs_server *server, struct nfs_fh *mntf 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; - set_pnfs_layoutdriver(server, mntfh, fsinfo->layouttype); server->pnfs_blksize = fsinfo->blksize; + set_pnfs_layoutdriver(server, mntfh, fsinfo->layouttype); server->wtmult = nfs_block_bits(fsinfo->wtmult, NULL);