From patchwork Sun May 21 15:41:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabian Frederick X-Patchwork-Id: 9739145 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 742C360328 for ; Sun, 21 May 2017 15:42:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6B72B28694 for ; Sun, 21 May 2017 15:42:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 605CE2869C; Sun, 21 May 2017 15:42:07 +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 1B26E28698 for ; Sun, 21 May 2017 15:42:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756906AbdEUPlx (ORCPT ); Sun, 21 May 2017 11:41:53 -0400 Received: from mailrelay108.isp.belgacom.be ([195.238.20.135]:62731 "EHLO mailrelay108.isp.belgacom.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756429AbdEUPlu (ORCPT ); Sun, 21 May 2017 11:41:50 -0400 X-Belgacom-Dynamic: yes IronPort-PHdr: =?us-ascii?q?9a23=3AiltP6hHhw2JNMjXUYzot5Z1GYnF86YWxBRYc798d?= =?us-ascii?q?s5kLTJ76ps+5bnLW6fgltlLVR4KTs6sC0LuI9f2/ESxYuNDa4S9EKMQNHzY+yu?= =?us-ascii?q?wo3CUYQ/S5QXXhK/DrayFoVO9jb3RCu0+BDE5OBczlbEfTqHDhpRQbGxH4KBYn?= =?us-ascii?q?br+tQt2agMu4zf299IPOaAtUmjW9falyLBKrpgnNq8Uam4VvJ6IwxxfTonZFef?= =?us-ascii?q?ldyWd0KV6OhRrx6MO98Zx5/yhMp/4t8tNLXLnncag/UbFXAzMqPnwv6sHsqRfN?= =?us-ascii?q?UxaE6GEGUmURnBpIAgzF4w//U5zsrCb0tfdz1TeDM8HuQr86RTqt76FwSB/1ky?= =?us-ascii?q?gHLCI28HvWisNrkq1Wpg+qqgFlzI7VZIGVM+d+fr/YcNgHS2dNQtpdWipcCY6n?= =?us-ascii?q?cYABE/QOMvpZr4nlplsBsx2+BRW3BOjyzjNEn2L60bEm3+gkFwzNwQ4uEM8UsH?= =?us-ascii?q?nMrNv7KrocX+62wqfP1jjPc+9a1C3h5IXSbhwtvfeBVq9wf8rLzkkvEhvIgFWK?= =?us-ascii?q?poP+PjOazOINuHWb4ep6S+2glnAoqxtwojezxccnl47EhowPxV/f+yV02501Jd?= =?us-ascii?q?64SU59f9GkDIFcuDqEOIZvRM4pXmJmuD4ix7AFu5O3ZikHxZU9yxPQZPGLaZaE?= =?us-ascii?q?7x3gWeuXPDx2nmhqeKiliBa36UWgz+r8WdSq31tStSpFl8XMtmgK1xzO9siLUv?= =?us-ascii?q?t98Vml2TaIzw3T7uZELlwumqrfK54hxaUwloYJvUTHGS/5hF/5jKuLeUUj/+in?= =?us-ascii?q?8eXnYrP+qp+dMY97lB3+P7wtl8G9G+g1MwkDU3KU9OmzzrHv40L0TbZSgv0ziK?= =?us-ascii?q?bZsZTaJcoBpq6+Bg9Yyogj5AykADeoy9kYhnoHLVJDeB2Zk4jlIUrBL+7gAfel?= =?us-ascii?q?n1usiCtrx+zBPrD5HJXNL2LDkLD6cLd89UFczgszzc5F65JQC7EBJu/zW0DruN?= =?us-ascii?q?zfFB85PBa4w/vkCN9lzIMRRXqPArOFMKPVqVKI/eIvLPODZI8auDfwMPsl6OD0?= =?us-ascii?q?jX8/h1AdebOl3ZwNaHC3Bv5mOVmWYWLwgtcdFmcHpgg+TOLxiFGbTDFTZm2yUL?= =?us-ascii?q?4h5jEgE4KmDIDDRoa2jbyF3Se7BYFWZntcBlCXFnfoap+EVOsSZyKcJc9hiDME?= =?us-ascii?q?Wqa7R48nyx6uqBfwy6B7IerM5i0YqZXj2cBx5+3SkxEy6DN1A92T02GWUm57gH?= =?us-ascii?q?0ISCEy3K1kv0x9xUmM0bJij/xbC9NT/fVJXRk+NZLGyOx6Ed/yUBrbftiVUFam?= =?us-ascii?q?XsmmATYpQ9I1wt8OZVt9Gtq7ghDAwSWqGbkVmKKPBJEv7KLc0Gb+J9xnx3bFyq?= =?us-ascii?q?YhlV8mTdVLNWG8ga5/7QfTDZbTk0qFj6aqabgc3CnV+WeN12WBp09YXRVrUaXG?= =?us-ascii?q?XXEfYFXZrcjj6kzZUbD9QYggZyJFxN6LLKdHcJXXjE9BDKP9Oc7ZS3C8nWauQx?= =?us-ascii?q?KJwK6cKo3wdCMA33OOJlIDllU99HyHPA52KD2sr2/EDTdtXQbhakni2fJ9uXW2?= =?us-ascii?q?Ugk+wlfZPAVay7Op90tN1rSnQPQJ0+dB4X95pg=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?kE4oXEbV4hBGHK4ZfjQSCSgWeFpMSDZFwlEgfOIEKTx8YhG0BglA+NokZAQEB?= X-IPAS-Result: =?us-ascii?q?A2DKAQCttCFZ//gsQldcHAELAQUBGAELAQUBgj9sKIFGjnq?= =?us-ascii?q?RJAGVSoIPIYYDhX9AGAEBAQEBAQEBAQEBaiiCMyQBgx0jgRokE4oXEbV4hBGHK?= =?us-ascii?q?4ZfjQSCSgWeFpMSDZFwlEgfOIEKTx8YhG0BglA+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:41:48 +0200 From: Fabian Frederick To: Alexander Viro Cc: Dave Kleikamp , jfs-discussion@lists.sourceforge.net, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, fabf@skynet.be Subject: [PATCH 06/11 linux-next] jfs: use magic.h Date: Sun, 21 May 2017 17:41:46 +0200 Message-Id: <20170521154146.27592-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: Dave Kleikamp --- fs/jfs/jfs_incore.h | 6 +----- include/uapi/linux/magic.h | 1 + 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/fs/jfs/jfs_incore.h b/fs/jfs/jfs_incore.h index 1f26d19..64b9152 100644 --- a/fs/jfs/jfs_incore.h +++ b/fs/jfs/jfs_incore.h @@ -23,16 +23,12 @@ #include #include #include +#include #include "jfs_types.h" #include "jfs_xtree.h" #include "jfs_dtree.h" /* - * JFS magic number - */ -#define JFS_SUPER_MAGIC 0x3153464a /* "JFS1" */ - -/* * JFS-private inode information */ struct jfs_inode_info { diff --git a/include/uapi/linux/magic.h b/include/uapi/linux/magic.h index b651a02..905eaa2 100644 --- a/include/uapi/linux/magic.h +++ b/include/uapi/linux/magic.h @@ -34,6 +34,7 @@ #define HPFS_SUPER_MAGIC 0xf995e849 #define HUGETLBFS_MAGIC 0x958458f6 /* some random number */ #define ISOFS_SUPER_MAGIC 0x9660 +#define JFS_SUPER_MAGIC 0x3153464a /* "JFS1" */ #define JFFS2_SUPER_MAGIC 0x72b6 #define MINIX2_SUPER_MAGIC 0x2468 /* minix v2 fs, 14 char names */ #define MINIX2_SUPER_MAGIC2 0x2478 /* minix v2 fs, 30 char names */