From patchwork Thu Sep 26 18:42:44 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benny Halevy X-Patchwork-Id: 2950491 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 33984BFF0B for ; Thu, 26 Sep 2013 18:42:52 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1B87E2017B for ; Thu, 26 Sep 2013 18:42:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1147A20164 for ; Thu, 26 Sep 2013 18:42:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754114Ab3IZSms (ORCPT ); Thu, 26 Sep 2013 14:42:48 -0400 Received: from mail-qe0-f50.google.com ([209.85.128.50]:33562 "EHLO mail-qe0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754103Ab3IZSmr (ORCPT ); Thu, 26 Sep 2013 14:42:47 -0400 Received: by mail-qe0-f50.google.com with SMTP id a11so1075653qen.23 for ; Thu, 26 Sep 2013 11:42:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=xUniLe+EzvQ/wPXA9f+zhL97E60TdvM1xeTHp8aGKUQ=; b=zo+WPsg2ExB7kwOFIeMH9EIDFyoLbNEjfRYnKbdz15mvqW8LcfKKu9TIklBWtm6vSi 5x4UhBVR9SczMTcEwTZRqtMNUCorNu043RuRmTKYh8IJuXlfnNtcop+5m01OA1SE4dod DVqytYXDc94yfPNOXvG+JWXEJNeN59OEE/o06NUf+HNgpaVGiM4sYm+CMRPdZQqDA38a MI/46l8INxk4GbnzX8peNkafj0RYI9M7i2N8tDLlAsAuKIt4sxwiuLWytEouRzruZgua 25MCv5rhtoYvdB+4W83xzhLI48C8BYERT1NDH9clUSPrLWahVlQj+B/JAVpkkfdTNXee 7fvw== X-Received: by 10.224.74.67 with SMTP id t3mr2037004qaj.124.1380220967213; Thu, 26 Sep 2013 11:42:47 -0700 (PDT) Received: from bhalevy-lt.il.tonian.com.com (nat-pool-bos-u.redhat.com. [66.187.233.207]) by mx.google.com with ESMTPSA id fy7sm5147513qeb.1.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 26 Sep 2013 11:42:46 -0700 (PDT) From: Benny Halevy To: " J. Bruce Fields" Cc: linux-nfs@vger.kernel.org Subject: [PATCH RFC v0 42/49] pnfsd: gfs2: use generic file layout pnfs operations vector Date: Thu, 26 Sep 2013 14:42:44 -0400 Message-Id: <1380220964-14623-1-git-send-email-bhalevy@primarydata.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <52447EA0.7070004@primarydata.com> References: <52447EA0.7070004@primarydata.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-9.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Andy Adamson Signed-off-by: Andy Adamson [gfs2: set pnfs_dlm_export_ops only for CONFIG_PNFSD] Signed-off-by: Benny Halevy Acked-by: Steven Whitehouse Signed-off-by: Benny Halevy --- fs/gfs2/ops_fstype.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fs/gfs2/ops_fstype.c b/fs/gfs2/ops_fstype.c index 19ff5e8..d16a6e6 100644 --- a/fs/gfs2/ops_fstype.c +++ b/fs/gfs2/ops_fstype.c @@ -21,6 +21,7 @@ #include #include #include +#include #include "gfs2.h" #include "incore.h" @@ -1154,6 +1155,9 @@ static int fill_super(struct super_block *sb, struct gfs2_args *args, int silent sb->s_op = &gfs2_super_ops; sb->s_d_op = &gfs2_dops; sb->s_export_op = &gfs2_export_ops; +#if defined(CONFIG_PNFSD) + sb->s_pnfs_op = &pnfs_dlm_export_ops; +#endif /* CONFIG_PNFSD */ sb->s_xattr = gfs2_xattr_handlers; sb->s_qcop = &gfs2_quotactl_ops; sb_dqopt(sb)->flags |= DQUOT_QUOTA_SYS_FILE;