lkml.org 
[lkml]   [2013]   [Nov]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: [PATCH] hfs: remove duplicate includes
On Mon, 21 Oct 2013 10:01:37 +0200 Michael Opdenacker <michael.opdenacker@free-electrons.com> wrote:

> This patch removes duplicate includes from fs/hfs/btree.h
>
> Signed-off-by: Michael Opdenacker <michael.opdenacker@free-electrons.com>
> ---
> fs/hfs/btree.h | 5 -----
> 1 file changed, 5 deletions(-)
>
> diff --git a/fs/hfs/btree.h b/fs/hfs/btree.h
> index 2a1d712..f6bd266 100644
> --- a/fs/hfs/btree.h
> +++ b/fs/hfs/btree.h
> @@ -153,11 +153,6 @@ struct hfs_btree_header_rec {
> u32 reserved3[16];
> } __packed;
>
> -#define HFS_NODE_INDEX 0x00 /* An internal (index) node */
> -#define HFS_NODE_HEADER 0x01 /* The tree header node (node 0) */
> -#define HFS_NODE_MAP 0x02 /* Holds part of the bitmap of used nodes */
> -#define HFS_NODE_LEAF 0xFF /* A leaf (ndNHeight==1) node */
> -
> #define BTREE_ATTR_BADCLOSE 0x00000001 /* b-tree not closed properly. not
> used by hfsplus. */
> #define HFS_TREE_BIGKEYS 0x00000002 /* key length is u16 instead of u8.

But we lost the nice comments...

From: Andrew Morton <akpm@linux-foundation.org>
Subject: fs-hfs-btreeh-remove-duplicate-defines-fix

retain the comments

Cc: Christoph Hellwig <hch@lst.de>
Cc: Michael Opdenacker <michael.opdenacker@free-electrons.com>
Cc: Vyacheslav Dubeyko <slava@dubeyko.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

fs/hfsplus/hfsplus_raw.h | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff -puN fs/hfs/btree.h~fs-hfs-btreeh-remove-duplicate-defines-fix fs/hfs/btree.h
diff -puN fs/hfsplus/hfsplus_raw.h~fs-hfs-btreeh-remove-duplicate-defines-fix fs/hfsplus/hfsplus_raw.h
--- a/fs/hfsplus/hfsplus_raw.h~fs-hfs-btreeh-remove-duplicate-defines-fix
+++ a/fs/hfsplus/hfsplus_raw.h
@@ -156,10 +156,10 @@ struct hfs_bnode_desc {
} __packed;

/* HFS+ BTree node types */
-#define HFS_NODE_INDEX 0x00
-#define HFS_NODE_HEADER 0x01
-#define HFS_NODE_MAP 0x02
-#define HFS_NODE_LEAF 0xFF
+#define HFS_NODE_INDEX 0x00 /* An internal (index) node */
+#define HFS_NODE_HEADER 0x01 /* The tree header node (node 0) */
+#define HFS_NODE_MAP 0x02 /* Holds part of the bitmap of used nodes */
+#define HFS_NODE_LEAF 0xFF /* A leaf (ndNHeight==1) node */

/* HFS+ BTree header */
struct hfs_btree_header_rec {
_


\
 
 \ /
  Last update: 2013-11-06 01:21    [W:0.047 / U:0.140 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site