From 931bb12de44249c81ca76cc138acb794a21021a7 Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@tuxera.com>
Date: Fri, 1 Oct 2010 05:44:02 +0200
Subject: [PATCH] --- yaml --- r: 211579 b: refs/heads/master c:
 58a818f532e83f337689358c102ba2048d1b37f5 h: refs/heads/master i:   211577:
 1088a574aa56ac0e7b79b4e8f9975e9f969d7132   211575:
 41706bd907e103a5ff44d2632e1fce27c1c63ef8 v: v3

---
 [refs]                        |  2 +-
 trunk/fs/hfsplus/hfsplus_fs.h |  2 --
 trunk/fs/hfsplus/inode.c      | 10 +++++++++-
 trunk/fs/hfsplus/super.c      |  1 -
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 686d6f07969a..8dffc5de3de2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 66e5db05bb6670f314d90aba5998e6a033e4d563
+refs/heads/master: 58a818f532e83f337689358c102ba2048d1b37f5
diff --git a/trunk/fs/hfsplus/hfsplus_fs.h b/trunk/fs/hfsplus/hfsplus_fs.h
index 5e2418a71887..0cd9ba00f968 100644
--- a/trunk/fs/hfsplus/hfsplus_fs.h
+++ b/trunk/fs/hfsplus/hfsplus_fs.h
@@ -145,8 +145,6 @@ struct hfsplus_sb_info {
 	int part, session;
 
 	unsigned long flags;
-
-	struct hlist_head rsrc_inodes;
 };
 
 #define HFSPLUS_SB_WRITEBACKUP	0x0001
diff --git a/trunk/fs/hfsplus/inode.c b/trunk/fs/hfsplus/inode.c
index 309defb4f41f..a05b3afa7230 100644
--- a/trunk/fs/hfsplus/inode.c
+++ b/trunk/fs/hfsplus/inode.c
@@ -204,7 +204,15 @@ static struct dentry *hfsplus_file_lookup(struct inode *dir, struct dentry *dent
 	hip->rsrc_inode = dir;
 	HFSPLUS_I(dir)->rsrc_inode = inode;
 	igrab(dir);
-	hlist_add_head(&inode->i_hash, &HFSPLUS_SB(sb)->rsrc_inodes);
+
+	/*
+	 * __mark_inode_dirty expects inodes to be hashed.  Since we don't
+	 * want resource fork inodes in the regular inode space, we make them
+	 * appear hashed, but do not put on any lists.  hlist_del()
+	 * will work fine and require no locking.
+	 */
+	inode->i_hash.pprev = &inode->i_hash.next;
+
 	mark_inode_dirty(inode);
 out:
 	d_add(dentry, inode);
diff --git a/trunk/fs/hfsplus/super.c b/trunk/fs/hfsplus/super.c
index f310a1fdcd5f..923f385b32ca 100644
--- a/trunk/fs/hfsplus/super.c
+++ b/trunk/fs/hfsplus/super.c
@@ -318,7 +318,6 @@ static int hfsplus_fill_super(struct super_block *sb, void *data, int silent)
 		return -ENOMEM;
 
 	sb->s_fs_info = sbi;
-	INIT_HLIST_HEAD(&sbi->rsrc_inodes);
 	mutex_init(&sbi->alloc_mutex);
 	hfsplus_fill_defaults(sbi);
 	if (!hfsplus_parse_options(data, sbi)) {