From patchwork Tue Jun 7 17:34:29 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Rees X-Patchwork-Id: 858642 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.3) with ESMTP id p57HXF04015750 for ; Tue, 7 Jun 2011 17:34:32 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754429Ab1FGReb (ORCPT ); Tue, 7 Jun 2011 13:34:31 -0400 Received: from int-mailstore01.merit.edu ([207.75.116.232]:52220 "EHLO int-mailstore01.merit.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753958Ab1FGReb (ORCPT ); Tue, 7 Jun 2011 13:34:31 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by int-mailstore01.merit.edu (Postfix) with ESMTP id 1368C3055B74; Tue, 7 Jun 2011 13:34:31 -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 S4s75GIzAajE; Tue, 7 Jun 2011 13:34:30 -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 7D6AF30852CE; Tue, 7 Jun 2011 13:34:30 -0400 (EDT) Date: Tue, 7 Jun 2011 13:34:29 -0400 From: Jim Rees To: Benny Halevy Cc: linux-nfs@vger.kernel.org, peter honeyman Subject: [PATCH 72/88] SQAUSHME: pnfsblock: no PNFS_NFS_SERVER Message-ID: 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 (demeter2.kernel.org [140.211.167.43]); Tue, 07 Jun 2011 17:34:32 +0000 (UTC) From: Benny Halevy --- fs/nfs/blocklayout/blocklayout.c | 2 +- fs/nfs/blocklayout/blocklayout.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/nfs/blocklayout/blocklayout.c b/fs/nfs/blocklayout/blocklayout.c index 5dbd9c6..5e50c93 100644 --- a/fs/nfs/blocklayout/blocklayout.c +++ b/fs/nfs/blocklayout/blocklayout.c @@ -619,7 +619,7 @@ static int bl_setup_layoutcommit(struct pnfs_layout_hdr *lo, struct nfs4_layoutcommit_args *arg) { - struct nfs_server *nfss = PNFS_NFS_SERVER(lo); + struct nfs_server *nfss = NFS_SERVER(lo->inode); struct bl_layoutupdate_data *layoutupdate_data; dprintk("%s enter\n", __func__); diff --git a/fs/nfs/blocklayout/blocklayout.h b/fs/nfs/blocklayout/blocklayout.h index d62e3f9..7db7768 100644 --- a/fs/nfs/blocklayout/blocklayout.h +++ b/fs/nfs/blocklayout/blocklayout.h @@ -191,7 +191,7 @@ struct bl_layoutupdate_data { struct list_head ranges; }; -#define BLK_ID(lo) ((struct block_mount_id *)(PNFS_NFS_SERVER(lo)->pnfs_ld_data)) +#define BLK_ID(lo) ((struct block_mount_id *)(NFS_SERVER(lo->inode)->pnfs_ld_data)) static inline struct pnfs_block_layout * BLK_LO2EXT(struct pnfs_layout_hdr *lo)