From patchwork Wed Mar 30 00:48:06 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Theodore Ts'o X-Patchwork-Id: 8691881 Return-Path: X-Original-To: patchwork-linux-fsdevel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 6FCDD9F30C for ; Wed, 30 Mar 2016 00:48:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9A29620220 for ; Wed, 30 Mar 2016 00:48:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BF2462017E for ; Wed, 30 Mar 2016 00:48:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758589AbcC3AsR (ORCPT ); Tue, 29 Mar 2016 20:48:17 -0400 Received: from imap.thunk.org ([74.207.234.97]:44748 "EHLO imap.thunk.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756836AbcC3AsL (ORCPT ); Tue, 29 Mar 2016 20:48:11 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=thunk.org; s=ef5046eb; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=MxpQVNnjEpODkPzr/OIEsWshwFPUMfuABHvJEciSmfY=; b=TRNTdCl3mrducn1BzuPDM77BGQQ5g06tN69YGVEJjIJojWjwRmqgLNXps9xBCfET+exFNTV8baXbZWZXHdDmpw7NteB3AWlBvmveU4LJUKv2PyO3gzYMMM3Hz9MB7rgrTrhR0Su1FGMfb1ba2T+JO1WhfcS8nJLPty0KrbvHZjc=; Received: from root (helo=closure.thunk.org) by imap.thunk.org with local-esmtp (Exim 4.84) (envelope-from ) id 1al4Ir-0002OG-BA; Wed, 30 Mar 2016 00:48:09 +0000 Received: by closure.thunk.org (Postfix, from userid 15806) id AE05A82CB34; Tue, 29 Mar 2016 20:48:08 -0400 (EDT) From: Theodore Ts'o To: jack@suse.cz Cc: Linux Filesystem Development List , Theodore Ts'o Subject: [PATCH 4/5] Provide fallback definitions for MNTTYPE_NFS and MNTTYPE_NOAUTO Date: Tue, 29 Mar 2016 20:48:06 -0400 Message-Id: <1459298887-21519-5-git-send-email-tytso@mit.edu> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1459298887-21519-1-git-send-email-tytso@mit.edu> References: <1459298887-21519-1-git-send-email-tytso@mit.edu> X-SA-Exim-Connect-IP: X-SA-Exim-Mail-From: tytso@thunk.org X-SA-Exim-Scanned: No (on imap.thunk.org); SAEximRunCond expanded to false Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Spam-Status: No, score=-7.8 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 Not all C library's /usr/include/mntent.h are guaranteed to define MNTTYPE_NFS and MNTTYPE_AUTO. Since we already are defining a large number of MNTTYPE_* macros for our own use in mntopt.h, add fallback definitions for MNTTYPE_NFS and MNTTYPE_NOAUTO there. Signed-off-by: Theodore Ts'o --- mntopt.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/mntopt.h b/mntopt.h index a70b4a4..3b33879 100644 --- a/mntopt.h +++ b/mntopt.h @@ -21,6 +21,10 @@ #define MNTTYPE_OCFS2 "ocfs2" /* Oracle Cluster filesystem */ #define MNTTYPE_GFS2 "gfs2" /* Red Hat Global filesystem 2 */ +#ifndef MNTTYPE_NFS +#define MNTTYPE_NFS "nfs" /* Network file system. */ +#endif + /* mount options */ #define MNTOPT_NOQUOTA "noquota" /* don't enforce quota */ #define MNTOPT_QUOTA "quota" /* enforce user quota */ @@ -34,4 +38,8 @@ #define MNTOPT_LOOP "loop" /* loopback mount */ #define MNTOPT_JQFMT "jqfmt" /* journaled quota format */ +#ifndef MNTOPT_NOAUTO +#define MNTOPT_NOAUTO "noauto" /* Do not auto mount. */ +#endif + #endif