linux-fsdevel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Andrew Morton <akpm@linux-foundation.org>
To: Michael Opdenacker <michael.opdenacker@free-electrons.com>
Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org,
	Vyacheslav Dubeyko <slava@dubeyko.com>
Subject: Re: [PATCH] hfs: remove duplicate includes
Date: Tue, 5 Nov 2013 15:38:14 -0800	[thread overview]
Message-ID: <20131105153814.c9786e731b937dd3316d5e93@linux-foundation.org> (raw)
In-Reply-To: <1382342497-3132-1-git-send-email-michael.opdenacker@free-electrons.com>

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 {
_

      parent reply	other threads:[~2013-11-05 23:38 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-10-21  8:01 [PATCH] hfs: remove duplicate includes Michael Opdenacker
2013-10-21  8:16 ` Vyacheslav Dubeyko
2013-11-05 23:38 ` Andrew Morton [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20131105153814.c9786e731b937dd3316d5e93@linux-foundation.org \
    --to=akpm@linux-foundation.org \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=michael.opdenacker@free-electrons.com \
    --cc=slava@dubeyko.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).