From patchwork Sun May 21 15:42:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabian Frederick X-Patchwork-Id: 9739157 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 A805E60328 for ; Sun, 21 May 2017 15:43:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9C44F24151 for ; Sun, 21 May 2017 15:43:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8E5BF28358; Sun, 21 May 2017 15:43:02 +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 53D6B24151 for ; Sun, 21 May 2017 15:43:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757004AbdEUPmq (ORCPT ); Sun, 21 May 2017 11:42:46 -0400 Received: from mailrelay108.isp.belgacom.be ([195.238.20.135]:43325 "EHLO mailrelay108.isp.belgacom.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757000AbdEUPmo (ORCPT ); Sun, 21 May 2017 11:42:44 -0400 X-Belgacom-Dynamic: yes IronPort-PHdr: =?us-ascii?q?9a23=3AxC1qHxVWNywUjbzlBIICDEC//0HV8LGtZVwlr6E/?= =?us-ascii?q?grcLSJyIuqrYZRSDuKdThVPEFb/W9+hDw7KP9fuxBypdvt7B6ClEK80TEUddyI?= =?us-ascii?q?0/pE8JPo2sMQ7BELbSdSs0HcBPBhdO3kqQFgxrIvv4fEDYuXao7DQfSV3VPAtx?= =?us-ascii?q?IfnpSMaJ15zkn++99IfObApWmTGzfa19LAmsrQXWq8IanZZuJrw/xxbNo3ZEYe?= =?us-ascii?q?RbyGF1Ll6Xgxrw+9288ZBn/ilSof4t69JMXaDndKkkULJUCygrPG8y6MD3rxfP?= =?us-ascii?q?SheB6GUBWWsMiBpIBAbF7BD+Xpjvtybxq/Rw1iqHM8DoVL44QTut4btlRx/uky?= =?us-ascii?q?cHKiU28HrLhcxqjaJUuwyuqhpiyIPJeo6VNf5+fqTAfdMGQGdKQ8hcWzBdDo66?= =?us-ascii?q?coACFPQKM/pGoIbhplsOtRq+CheqBOPz0T9Dm3v60bQn3+g9DQ3K2QotFM8Mvn?= =?us-ascii?q?vJttX4LKccX/6owqfGzjvNaOhb1Svh5IXSbhwsu+2AUa52fMHMyUcvDQTFjlCI?= =?us-ascii?q?pILlJTyazeUNvHKd7+F9VeyvkXAopBxvrTi1x8cjlorJjZ8Sx1DK7yp224g1KM?= =?us-ascii?q?ajSE54Yd+kFoVftz2AO4RtXMwvWmdlszs5xL0eoZO2fyoHxI4myhPecfCKfIeF?= =?us-ascii?q?7gj9WOueIjp1gm9udqiliBao60egz/XxVsyz0FlXsCVIisLMtnUR1xzL7ciHV+?= =?us-ascii?q?d98l+h2TmR0wDT7flJIUQzlaXHMZEhxr4wlp0IsUTfBCP2nEL2g7OMeUUg5+eo?= =?us-ascii?q?7OHnba/npp+aL4N0iwf+PboymsGnAuk1MBICUmma9Oim27Du8lf1TKtFg/A1iq?= =?us-ascii?q?XZtYrVJcUfpq63GQ9V1YMj5g6xDzi8y9sYk2IKLElGeBOHiYjmJU3OLOrjAvih?= =?us-ascii?q?m1isiitkx+jaPr39BZXANmbDkLb7fbZ68ENdyRQ8zdZe55JKEL0BJPPzWknstN?= =?us-ascii?q?3XFBM5NBa0w+n9BNVg1YMUQXiPDbOBMKPOrV+I4foiI+mQa48Vozv9Kv4l5/D0?= =?us-ascii?q?jXAjhFASY7Om0oYNZHC/BPRmLF2TYWDwjdcZDWcKog0+QfTuiF2DVz5TenmzU7?= =?us-ascii?q?sy5jEgFY2pE5nDSZ6pgLGawie7EYNZZnpcBlCPD3jobYOEVOkIaC6IJc9hiDME?= =?us-ascii?q?X6C7S4A9zRGuqBP6y71/I+rQ+y0Ys4/j1dds6+3Qix4y7zp0ANqZ02yWUWF0kX?= =?us-ascii?q?0HRyUs0KB8v0N90FGD3rZ8g/BCEtxT/fxJWB8gNZHA1+x6F8zyWgXZc9eHUlmp?= =?us-ascii?q?WdumDCoqTtIyw94OZVhyG8m4gh/YwSX5S4MSwpWPCYw99K7RxTDPJtx6gyLY1b?= =?us-ascii?q?Mmp0srRMpRc2mngLNvsQ/JCMjUkBPKubytcPEy1STM/WHL43CDsExCUQVzGfHL?= =?us-ascii?q?VHoRTlDVvNL0+gXIQun9WvwcLgJdxJvaeeNxYdrzgAADHa+7NQ=3D=3D?= X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: =?us-ascii?q?A2DKAQCttCFZ//gsQldcHAELAQUBGAELA?= =?us-ascii?q?QUBgj9sKIFGjnqRJAGVSoIPIYYDhX9AGAEBAQEBAQEBAQEBaiiCMyQBgm4vI4E?= =?us-ascii?q?aJBOKFxG1PjqEEYcrhl+NBIJKBZ4WkxINkXCUSB84gQpPHxiEbQELgkU+NokZA?= =?us-ascii?q?QEB?= X-IPAS-Result: =?us-ascii?q?A2DKAQCttCFZ//gsQldcHAELAQUBGAELAQUBgj9sKIFGjnq?= =?us-ascii?q?RJAGVSoIPIYYDhX9AGAEBAQEBAQEBAQEBaiiCMyQBgm4vI4EaJBOKFxG1PjqEE?= =?us-ascii?q?Ycrhl+NBIJKBZ4WkxINkXCUSB84gQpPHxiEbQELgkU+NokZAQEB?= 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:42:42 +0200 From: Fabian Frederick To: Alexander Viro Cc: Christoph Hellwig , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, fabf@skynet.be Subject: [PATCH 09/11 linux-next] freevxfs: use magic.h Date: Sun, 21 May 2017 17:42:41 +0200 Message-Id: <20170521154241.28207-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/freevxfs/vxfs.h | 6 +----- include/uapi/linux/magic.h | 1 + 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/fs/freevxfs/vxfs.h b/fs/freevxfs/vxfs.h index a41ea0b..3bde7dd 100644 --- a/fs/freevxfs/vxfs.h +++ b/fs/freevxfs/vxfs.h @@ -38,11 +38,7 @@ * superblocks of the Veritas Filesystem. */ #include - -/* - * Superblock magic number (vxfs_super->vs_magic). - */ -#define VXFS_SUPER_MAGIC 0xa501FCF5 +#include /* * The root inode. diff --git a/include/uapi/linux/magic.h b/include/uapi/linux/magic.h index 6afc4b2..e61d5af 100644 --- a/include/uapi/linux/magic.h +++ b/include/uapi/linux/magic.h @@ -78,6 +78,7 @@ #define UDF_SUPER_MAGIC 0x15013346 /* Since UDF 2.01 is ISO 13346 based... */ #define USBDEVICE_SUPER_MAGIC 0x9fa2 #define V9FS_MAGIC 0x01021997 +#define VXFS_SUPER_MAGIC 0xa501FCF5 #define XENFS_SUPER_MAGIC 0xabba1974 #define ZSMALLOC_MAGIC 0x58295829