From patchwork Sun May 21 15:41:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabian Frederick X-Patchwork-Id: 9739147 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 D370960328 for ; Sun, 21 May 2017 15:42:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CAAE428694 for ; Sun, 21 May 2017 15:42:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BE0BF2869C; Sun, 21 May 2017 15:42:25 +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 70A1B28694 for ; Sun, 21 May 2017 15:42:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756633AbdEUPlv (ORCPT ); Sun, 21 May 2017 11:41:51 -0400 Received: from mailrelay108.isp.belgacom.be ([195.238.20.135]:62696 "EHLO mailrelay108.isp.belgacom.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752665AbdEUPlu (ORCPT ); Sun, 21 May 2017 11:41:50 -0400 X-Belgacom-Dynamic: yes IronPort-PHdr: =?us-ascii?q?9a23=3AqUW6Fhe0fXS/Uyb4GDBhJnWdlGMj4u6mDksu8pMi?= =?us-ascii?q?zoh2WeGdxc27ZReN2/xhgRfzUJnB7Loc0qyN4v6mBDNIoc7Y9itTL9oUD15NoP?= =?us-ascii?q?5VtjJjKfbGM3GzFOTtYS0+EZYKf35e1Fb/D3JoHt3jbUbZuHy44G1aMBz+MQ1o?= =?us-ascii?q?Ora9QdaK3Iy42O+o5pLcfRhDiiajbrNuNhW2qhjautULjYd4JKs8zhrErmFIdu?= =?us-ascii?q?lU2GhkIU6fkwvm6sq++JNu8T5ct+49+8JFTK73Y7k2QbtEATspNGw4+NfluR7f?= =?us-ascii?q?QwWR+3ASSH8Wkh1GAwjE6BH1QJL8uTbku+R+xSeXI9T4Qag7Vjq+4ahrTgToiD?= =?us-ascii?q?ocOD4i7G7XkM1wg7lFrx+nuhdy3pTbYICRNPp5Y6PdYdYXTndPU8pNSyBMBJ63?= =?us-ascii?q?YpARBOQdI+lXs4j9p0MPrRSgAwmsGPjvwSJMinPvwKE2z/gtHQTA0Qc9HdwBrW?= =?us-ascii?q?7Uoc31OqkMTO67wqrGwzLYYv9KxTvw8pTEfwo9rf2QW797bMrfyVMoFwPAllie?= =?us-ascii?q?qZbqMCiU1usXtWiQ8upuVfixhGE6tQ5xuDmvydsvioLUgY8VxErL+j53wIsuPt?= =?us-ascii?q?24S056Ydi6H5tMrS2VLJV5T9okTmp1uyg60qULtJ25cSQQyZkqxgTTZvOIfoSS?= =?us-ascii?q?/B7uW+WcLDFlj3x/Yr2/nQy98U24x+35Ucm7zUhFozJektnJqnANzxvT6tWbSv?= =?us-ascii?q?dl/keuxzKP1wfL5+FAJkA7ibDUK5ohwr43jZoTrV7PHivxmErqlqCWclgr+u+t?= =?us-ascii?q?6+v9Y7XmoIeQN45yig7gLqQjgs+yDOYiPgUPXmWX4+ux2bL58UHnT7hHjeU6kq?= =?us-ascii?q?zDv5DbIcQbqLS5AwhQ0os75RawFSyp0NoDkHkcL1JEeBSHgJb1O13UO//3E++z?= =?us-ascii?q?g06wnzdz2/DGIrrhD43TLnjCirfheq1w6k9Cxwo1zNBf+YhYCrUAIPL1R0/wu8?= =?us-ascii?q?bUDhgjMwy72ernFdZ93JsEWW2TGq+ZLL/SsViQ6+I1IumDeI8VtyznK/c4/PPu?= =?us-ascii?q?i3g5lkIHcaazwZsdcGq4Eeh+I0WFfXrshc8MEWMLvgo4Uezrh0SOUTtPZ3mvRK?= =?us-ascii?q?884jA7CJm6DYfYXIytgbqB3CmhHpJMe29JFEqDHmrye4WDQfcMZzqYItV9nTwc?= =?us-ascii?q?SbihV4gh2AmqtA/7zbpnM+XV9jQWtZL4ydd6+fPTmg829TFvEcSd3H+CT3tukm?= =?us-ascii?q?MLWTA2xqZ/rlJ5yluZ1qh4mfNYH8RJ5/xVSgc6KYLcz+tiBtD2WwLBeMqJSVm/?= =?us-ascii?q?TtWlHz4xVNQxzMEKY0tmBdWigQ7M3zCwD78WibOLHpo0/bzY33TrIMZ90XnG3r?= =?us-ascii?q?E7j1Y6WstPKXGmhqln+gjdHYHGiEuZmr2xdaQf3C/N8nmMzXaUsE5DTgEjGZnC?= =?us-ascii?q?CFkba1vfq9j0/Av8TqWpQeA5MxFG4dyPLKpULNnoi0hWAvD5N5LDYDTitX23AE?= =?us-ascii?q?Omz7mNZYyiVX8Q0CjHCUMH21Qd9HyIHRM9FyGsvyTUAWo9RhrUf0rw/Lwm+zuA?= =?us-ascii?q?RUguwlTPNhU52g=3D=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:38 +0200 From: Fabian Frederick To: Alexander Viro Cc: Richard Weinberger , linux-mtd@lists.infradead.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, fabf@skynet.be Subject: [PATCH 05/11 linux-next] ubifs: use magic.h Date: Sun, 21 May 2017 17:41:33 +0200 Message-Id: <20170521154133.27428-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 Acked-by: Richard Weinberger --- fs/ubifs/ubifs.h | 4 +--- include/uapi/linux/magic.h | 1 + 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h index 298b4d8..abc60d5 100644 --- a/fs/ubifs/ubifs.h +++ b/fs/ubifs/ubifs.h @@ -38,6 +38,7 @@ #include #include #include +#include #ifdef CONFIG_UBIFS_FS_ENCRYPTION #include #else @@ -49,9 +50,6 @@ /* Version of this UBIFS implementation */ #define UBIFS_VERSION 1 -/* UBIFS file system VFS magic number */ -#define UBIFS_SUPER_MAGIC 0x24051905 - /* Number of UBIFS blocks per VFS page */ #define UBIFS_BLOCKS_PER_PAGE (PAGE_SIZE / UBIFS_BLOCK_SIZE) #define UBIFS_BLOCKS_PER_PAGE_SHIFT (PAGE_SHIFT - UBIFS_BLOCK_SHIFT) diff --git a/include/uapi/linux/magic.h b/include/uapi/linux/magic.h index a83c48f..b651a02 100644 --- a/include/uapi/linux/magic.h +++ b/include/uapi/linux/magic.h @@ -70,6 +70,7 @@ #define SYSFS_MAGIC 0x62656572 #define TMPFS_MAGIC 0x01021994 #define TRACEFS_MAGIC 0x74726163 +#define UBIFS_SUPER_MAGIC 0x24051905 #define UDF_SUPER_MAGIC 0x15013346 /* Since UDF 2.01 is ISO 13346 based... */ #define USBDEVICE_SUPER_MAGIC 0x9fa2 #define V9FS_MAGIC 0x01021997