From patchwork Tue Jun 7 17:35:08 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Rees X-Patchwork-Id: 858702 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 p57HYqWc022392 for ; Tue, 7 Jun 2011 17:35:11 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756042Ab1FGRfL (ORCPT ); Tue, 7 Jun 2011 13:35:11 -0400 Received: from int-mailstore01.merit.edu ([207.75.116.232]:52449 "EHLO int-mailstore01.merit.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755985Ab1FGRfK (ORCPT ); Tue, 7 Jun 2011 13:35:10 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by int-mailstore01.merit.edu (Postfix) with ESMTP id ED02A3055B74; Tue, 7 Jun 2011 13:35:09 -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 z7hlNl9luf4G; Tue, 7 Jun 2011 13:35:09 -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 D62A13083A6D; Tue, 7 Jun 2011 13:35:08 -0400 (EDT) Date: Tue, 7 Jun 2011 13:35:08 -0400 From: Jim Rees To: Benny Halevy Cc: linux-nfs@vger.kernel.org, peter honeyman Subject: [PATCH 78/88] SQUASHME: pnfs-block: use {set,clear}_layoutdriver 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 (demeter1.kernel.org [140.211.167.41]); Tue, 07 Jun 2011 17:35:12 +0000 (UTC) From: Benny Halevy Methods renamed by Trond as of 2.6.37 Signed-off-by: Benny Halevy --- fs/nfs/blocklayout/blocklayout.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fs/nfs/blocklayout/blocklayout.c b/fs/nfs/blocklayout/blocklayout.c index 57a7f04..5be912e 100644 --- a/fs/nfs/blocklayout/blocklayout.c +++ b/fs/nfs/blocklayout/blocklayout.c @@ -752,7 +752,7 @@ nfs4_blk_get_deviceinfo(struct nfs_server *server, const struct nfs_fh *fh, * Retrieve the list of available devices for the mountpoint. */ static int -bl_initialize_mountpoint(struct nfs_server *server, const struct nfs_fh *fh) +bl_set_layoutdriver(struct nfs_server *server, const struct nfs_fh *fh) { struct block_mount_id *b_mt_id = NULL; struct pnfs_mount_type *mtype = NULL; @@ -817,7 +817,7 @@ bl_initialize_mountpoint(struct nfs_server *server, const struct nfs_fh *fh) } static int -bl_uninitialize_mountpoint(struct nfs_server *server) +bl_clear_layoutdriver(struct nfs_server *server) { struct block_mount_id *b_mt_id = server->pnfs_ld_data; @@ -1114,8 +1114,8 @@ static struct pnfs_layoutdriver_type blocklayout_type = { .setup_layoutcommit = bl_setup_layoutcommit, .encode_layoutcommit = bl_encode_layoutcommit, .cleanup_layoutcommit = bl_cleanup_layoutcommit, - .initialize_mountpoint = bl_initialize_mountpoint, - .uninitialize_mountpoint = bl_uninitialize_mountpoint, + .set_layoutdriver = bl_set_layoutdriver, + .clear_layoutdriver = bl_clear_layoutdriver, .pg_test = bl_pg_test, };