From patchwork Thu Sep 26 18:40:19 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benny Halevy X-Patchwork-Id: 2950141 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 D99FF9F288 for ; Thu, 26 Sep 2013 18:40:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4C0D8202D1 for ; Thu, 26 Sep 2013 18:40:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 46FEF202F0 for ; Thu, 26 Sep 2013 18:40:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753303Ab3IZSkX (ORCPT ); Thu, 26 Sep 2013 14:40:23 -0400 Received: from mail-qa0-f46.google.com ([209.85.216.46]:46579 "EHLO mail-qa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753047Ab3IZSkW (ORCPT ); Thu, 26 Sep 2013 14:40:22 -0400 Received: by mail-qa0-f46.google.com with SMTP id j7so4618151qaq.19 for ; Thu, 26 Sep 2013 11:40:22 -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=bXyVRX7Xa3tM+6eYWRA4dbosXu3zTfd722bqUUwjcFw=; b=sDBEZGyKNj86KLETgYipF8BUAuy8E9Rw2Yw39283TfLXmCTcnsR2jc0Rl2FHJ0v7DQ VzvC+vjBOIn7WaWA+rQ8JgYo7aXMsQS48yeybptnQMbw4ICJdx6L+ENDxDn6nhSXtaUc 8z6zLMTW2lcmT+judQaN2xqf4RuEmOaFyh7Nr/ZHdG2vQldWdtEIlJfJh3Nyeg5sE8Zw +Zmrh9JQCicjO8PFKafPcGNtJ2kPR+L9yzHE66ARGOGbD5bvhQXdV0Mt9eTnldjmFi+i dNOQQIJ5NGymLTfhj64XzN4dXpbUTFT+sgIbWthTGt8+J7omaTxgTu0zp1ld6VhHeSLB nBBw== X-Received: by 10.49.97.42 with SMTP id dx10mr3576442qeb.47.1380220821918; Thu, 26 Sep 2013 11:40:21 -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 f5sm5109182qev.8.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 26 Sep 2013 11:40:21 -0700 (PDT) From: Benny Halevy To: " J. Bruce Fields" Cc: linux-nfs@vger.kernel.org Subject: [PATCH RFC v0 07/49] pnfsd: add pnfs export option Date: Thu, 26 Sep 2013 14:40:19 -0400 Message-Id: <1380220819-12999-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 This is a boolean for now. When more layouttypes are supported, this can change to "pnfs=", similar to "sec=". The ctl interface is not enhanced. Note: Export option strings are not guaranteed to be present in every call to svc_export_parse. For example, nfs-utils-1.1.2 exportfs validates the export with a test call that does not include the 'pnfs' export option even though it is set in /etc/exports. nfsd4_layout_verify() checks if ex_pnfs is set so the ex_pnfs check in check_export is not needed. Furthermore,the pnfs_export_operations super block pointer should not be changed because a) it is a const and b) the exports options can be changed while the file system is mounted. Remove the ex_pnfs check from check_export to prevent the pnfs_export_operations superblock pointer from being set to NULL. Signed-off-by: Andy Adamson [pnfsd: fix cosmetic checkpatch warnings] [pnfsd: test pnfs export option in check_export] Signed-off-by: Benny Halevy [pnfsd: fix ex_pnfs check_export bug] Signed-off-by: Andy Adamson Signed-off-by: Benny Halevy Signed-off-by: Benny Halevy --- fs/nfsd/export.c | 6 ++++++ include/linux/nfsd/export.h | 1 + 2 files changed, 7 insertions(+) diff --git a/fs/nfsd/export.c b/fs/nfsd/export.c index f26b0b9..7730dfd 100644 --- a/fs/nfsd/export.c +++ b/fs/nfsd/export.c @@ -567,6 +567,8 @@ static int svc_export_parse(struct cache_detail *cd, char *mesg, int mlen) if (exp.ex_uuid == NULL) err = -ENOMEM; } + } else if (strcmp(buf, "pnfs") == 0) { + exp.ex_pnfs = 1; } else if (strcmp(buf, "secinfo") == 0) err = secinfo_parse(&mesg, buf, &exp); else @@ -639,6 +641,8 @@ static int svc_export_show(struct seq_file *m, seq_printf(m, "%02x", exp->ex_uuid[i]); } } + if (exp->ex_pnfs) + seq_puts(m, ",pnfs"); show_secinfo(m, exp); } seq_puts(m, ")\n"); @@ -666,6 +670,7 @@ static void svc_export_init(struct cache_head *cnew, struct cache_head *citem) new->ex_fslocs.locations_count = 0; new->ex_fslocs.migrated = 0; new->ex_uuid = NULL; + new->ex_pnfs = 0; new->cd = item->cd; } @@ -679,6 +684,7 @@ static void export_update(struct cache_head *cnew, struct cache_head *citem) new->ex_anon_uid = item->ex_anon_uid; new->ex_anon_gid = item->ex_anon_gid; new->ex_fsid = item->ex_fsid; + new->ex_pnfs = item->ex_pnfs; new->ex_uuid = item->ex_uuid; item->ex_uuid = NULL; new->ex_fslocs.locations = item->ex_fslocs.locations; diff --git a/include/linux/nfsd/export.h b/include/linux/nfsd/export.h index 7898c99..b03ceee 100644 --- a/include/linux/nfsd/export.h +++ b/include/linux/nfsd/export.h @@ -52,6 +52,7 @@ struct svc_export { kuid_t ex_anon_uid; kgid_t ex_anon_gid; int ex_fsid; + int ex_pnfs; unsigned char * ex_uuid; /* 16 byte fsid */ struct nfsd4_fs_locations ex_fslocs; int ex_nflavors;