From patchwork Sun May 21 15:41:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabian Frederick X-Patchwork-Id: 9739139 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3BC5760328 for ; Sun, 21 May 2017 15:41:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3276928694 for ; Sun, 21 May 2017 15:41:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 274892869C; Sun, 21 May 2017 15:41:42 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A822628698 for ; Sun, 21 May 2017 15:41:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756858AbdEUPl1 (ORCPT ); Sun, 21 May 2017 11:41:27 -0400 Received: from mailrelay108.isp.belgacom.be ([195.238.20.135]:62662 "EHLO mailrelay108.isp.belgacom.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752665AbdEUPlX (ORCPT ); Sun, 21 May 2017 11:41:23 -0400 X-Belgacom-Dynamic: yes IronPort-PHdr: =?us-ascii?q?9a23=3A801AmRyHZ0f+RffXCy+O+j09IxM/srCxBDY+r6Qd?= =?us-ascii?q?0usSL/ad9pjvdHbS+e9qxAeQG96KtbQZ1KKW6/mmAj1fp87Z8TgrS99laVwssY?= =?us-ascii?q?Yso0QYGsmLCEn2frbBThcRO4B8bmJj5GyxKkNPGczzNBX4q3y26iMOSF2kbVIm?= =?us-ascii?q?buv6FZTPgMupyuu854PcYxlShDq6fLh+MAi6oR/fu8QSgIZuMKY8xxnUqXdMZ+?= =?us-ascii?q?ha2HlkKFyXkhv+/Mu84IJv/yFNsP896sBMVrn3cKs/QbFEFjoqNHw76tP2vhfZ?= =?us-ascii?q?VwuP4XUcUmQSkhVWBgXO8Q/3UJTsvCbkr+RxwCaVM9H4QrAyQjSi8rxkSAT0hy?= =?us-ascii?q?cdNj4263/Yh8pth69Guh2hphh/w4nJYIGJMfd1Y63Qcc8GSWdHQ81cTDJKDJ+i?= =?us-ascii?q?YIQTDuoBJedYoJf7p1sSthu1GA2gCPryxjNUmnP62Ks32PkjHw7bxgwtB9IAvm?= =?us-ascii?q?rJotv7N6kcVvu4wLXUwTjZc/9bwyvx5JTOfxs8of+MR7Vwcc/JxEcvDQzKlVSQ?= =?us-ascii?q?ppbjPziI1uoNqXaU4Pd+WuK1im4otwJxqSWoy8cikIbGnYwVx0vf9SV6wIc1I8?= =?us-ascii?q?O3SFJhbdG/DpRdrieXPJZ1TMM6W2xluyQ3xqcHtJO6ZiQHx5sqywTBZ/GIcIWF?= =?us-ascii?q?5A/oWvyLLjdinn1lfaqyhxO18Ue91OLxTtK00FNWripdldnMq2wN2wTT6seZTv?= =?us-ascii?q?t9+V+s2TKI1w/P8O5EJUA0la3AK5492LIwkp0TvljZES/yhUr2i6qWeV8l+uiu?= =?us-ascii?q?8+jnY7PmqYGAN4JsiQzzML4il82+DOgiPQUDUHKX9fqz2bDg5UH5Ra9Fjvwykq?= =?us-ascii?q?nXqpDaIsEbq7a3AwBPyYkj5Q2yDyyl0NUYm3kIMk5FdAicgIf3I13OOuz3De+j?= =?us-ascii?q?g1Swlzdm3+7GPrz7ApXKNXXCkanufbB8605C0gYzydFf55RJCrAOOv7zXVXxtN?= =?us-ascii?q?PCAh8kMAy+2/znB8ll1oMCRWKPBbeUMKPPsVCT+u0gOfGMaZQSuDb4Lfgl5uXh?= =?us-ascii?q?jXg/mVAAZ6WmwZwXaHWgFPR8P0qZeWbsgssGEWoSpgo+UuLqiEacXTJKenm9Qb?= =?us-ascii?q?w86S8/CIKhFYfMWJqtgKea0SigAJJWYW5HCk2IEXfmbomERvEMZz+MLc97nTwE?= =?us-ascii?q?T7+hS5In1R6zrgP6zKBnLuXM8C0CqZ3jzMR15/HUlRwq8Tx0DsKd03yCTm1tkG?= =?us-ascii?q?MIXCI5075hoUNjzleOyrZ4g/NGGtxJ/f9JURk1NYTaz+NkD9D+QAXBfs2GSFy+?= =?us-ascii?q?WNWpHSkxTs4tw98Je0t9H9Sijhbe3yulGrMVlKKEBIYy8q3C23j8PNh9y3nY26?= =?us-ascii?q?k7lVUmQdVANXeghqFh8wjfHYnJk1+Wl6yyb6QTwDbN9HufzWqJpExYXhR/Xr7L?= =?us-ascii?q?XX0EfUvWrtT45kXcQL+yE7goKRVOmoa+Lf5jbtD5hFNKSe2rBtXEZCrlhWaqAj?= =?us-ascii?q?6ay7WNcszuemMAzGPaEkdCjgNFrlicMg1rKC6romvYRBJ0GF7ieULn8qEqpnqx?= =?us-ascii?q?QGcvzBCMYlEn3bfjqU1dvuCVV/5GhuFMgywmsTghWQ/lh98=3D?= X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: =?us-ascii?q?A2DKAQCttCFZ//gsQldcHAELAQUBGAELA?= =?us-ascii?q?QUBgj9sKIFGjnqRJAGVSoIPIYYDhX9AGAEBAQEBAQEBAQEBaiiCMyQBgx0jgRo?= =?us-ascii?q?kE4oXEbV4hBGHK4ZfjQSCSgWeFpMSDZFwlEgfOIEKTx8YhG0BC4JFPjaJGQEBA?= =?us-ascii?q?Q?= X-IPAS-Result: =?us-ascii?q?A2DKAQCttCFZ//gsQldcHAELAQUBGAELAQUBgj9sKIFGjnq?= =?us-ascii?q?RJAGVSoIPIYYDhX9AGAEBAQEBAQEBAQEBaiiCMyQBgx0jgRokE4oXEbV4hBGHK?= =?us-ascii?q?4ZfjQSCSgWeFpMSDZFwlEgfOIEKTx8YhG0BC4JFPjaJGQEBAQ?= Received: from 248.44-66-87.adsl-dyn.isp.belgacom.be (HELO localhost.localdomain) ([87.66.44.248]) by relay.skynet.be with ESMTP; 21 May 2017 17:41:20 +0200 From: Fabian Frederick To: Alexander Viro Cc: Mike Marshall , pvfs2-developers@beowulf-underground.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, fabf@skynet.be Subject: [PATCH 04/11 linux-next] orangefs: use magic.h Date: Sun, 21 May 2017 17:41:00 +0200 Message-Id: <20170521154100.27092-1-fabf@skynet.be> X-Mailer: git-send-email 2.9.3 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Filesystems generally use SUPER_MAGIC values from magic.h instead of a local definition. Signed-off-by: Fabian Frederick --- fs/orangefs/protocol.h | 3 +-- include/uapi/linux/magic.h | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/orangefs/protocol.h b/fs/orangefs/protocol.h index 48bcc1b..a511ac6 100644 --- a/fs/orangefs/protocol.h +++ b/fs/orangefs/protocol.h @@ -3,6 +3,7 @@ #include #include #include +#include /* pvfs2-config.h ***********************************************************/ #define ORANGEFS_VERSION_MAJOR 2 @@ -80,8 +81,6 @@ typedef __u64 ORANGEFS_ds_position; typedef __s32 ORANGEFS_error; typedef __s64 ORANGEFS_offset; -#define ORANGEFS_SUPER_MAGIC 0x20030528 - /* * ORANGEFS error codes are a signed 32-bit integer. Error codes are negative, but * the sign is stripped before decoding. diff --git a/include/uapi/linux/magic.h b/include/uapi/linux/magic.h index 507f3c3..a83c48f 100644 --- a/include/uapi/linux/magic.h +++ b/include/uapi/linux/magic.h @@ -47,6 +47,7 @@ #define NILFS_SUPER_MAGIC 0x3434 #define NSFS_MAGIC 0x6e736673 #define OPENPROM_SUPER_MAGIC 0x9fa1 +#define ORANGEFS_SUPER_MAGIC 0x20030528 #define OVERLAYFS_SUPER_MAGIC 0x794c7630 #define PIPEFS_MAGIC 0x50495045 #define PROC_SUPER_MAGIC 0x9fa0