From patchwork Thu Sep 26 18:42:34 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benny Halevy X-Patchwork-Id: 2950471 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 52E489F288 for ; Thu, 26 Sep 2013 18:42:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4AB1D202F0 for ; Thu, 26 Sep 2013 18:42:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E1D6E202DD for ; Thu, 26 Sep 2013 18:42:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753939Ab3IZSmi (ORCPT ); Thu, 26 Sep 2013 14:42:38 -0400 Received: from mail-qc0-f169.google.com ([209.85.216.169]:64534 "EHLO mail-qc0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753553Ab3IZSmh (ORCPT ); Thu, 26 Sep 2013 14:42:37 -0400 Received: by mail-qc0-f169.google.com with SMTP id c9so1045020qcz.14 for ; Thu, 26 Sep 2013 11:42:37 -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=51Gcl6q9jyQhcDQptJ5OAr2bis5wNELk6DLaoMb9yTY=; b=rE6KfjYkieBgwigbz+UqeJL4mAfJ1rtb5o2YhQEwLXwERU7nCu9DK7RzFYtW6VLGlN cjtw5rnvI7F1Yzz7U7731PbfbNZsmweMdyDAyVbM1kgxOhmYEaIpdogKuVmxGxJZN8D6 J0ibZlqdXIDde6dwxfL5HSeRlVJDSbZa9Bh9mZEvfE8rqT0mAjEcJKg2rK02IOs+fSBU RU1sRCi1+eau+DBmSYIYZ5J7mrsXB6Cb2UGRi5h9tODTqRlz2MAA+wygKmCPqTBBMqzS Ddk3k+AsjAWs6fxGftlZAyc83W3344r9O3bhQK6pgzkfQEQ4SDAG0JeGYb6XnlInjFku bafg== X-Received: by 10.224.7.199 with SMTP id e7mr4039542qae.121.1380220957253; Thu, 26 Sep 2013 11:42:37 -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 h20sm5129280qen.5.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 26 Sep 2013 11:42:36 -0700 (PDT) From: Benny Halevy To: " J. Bruce Fields" Cc: linux-nfs@vger.kernel.org Subject: [PATCH RFC v0 40/49] pnfsd: add dlm file layout layout-type Date: Thu, 26 Sep 2013 14:42:34 -0400 Message-Id: <1380220954-14530-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 Export nfsd4_pnfs_dlm_layouttype for use by dlm cluster file systems. Signed-off-by: Andy Adamson Acked-by: Steven Whitehouse [pnfsd: dlm: fixup LAYOUT_NFSV4_1_FILES] Signed-off-by: Benny Halevy Signed-off-by: Benny Halevy --- fs/nfsd/nfs4pnfsdlm.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/fs/nfsd/nfs4pnfsdlm.c b/fs/nfsd/nfs4pnfsdlm.c index acc1f91..de1af22 100644 --- a/fs/nfsd/nfs4pnfsdlm.c +++ b/fs/nfsd/nfs4pnfsdlm.c @@ -446,8 +446,15 @@ static enum nfsstat4 nfsd4_pnfs_dlm_layoutget(struct inode *inode, goto exit; } +static int +nfsd4_pnfs_dlm_layouttype(struct super_block *sb) +{ + return LAYOUT_NFSV4_1_FILES; +} + /* For use by DLM cluster file systems exported by pNFSD */ const struct pnfs_export_operations pnfs_dlm_export_ops = { + .layout_type = nfsd4_pnfs_dlm_layouttype, .get_device_info = nfsd4_pnfs_dlm_getdevinfo, .get_device_iter = nfsd4_pnfs_dlm_getdeviter, .layout_get = nfsd4_pnfs_dlm_layoutget,