From 86d1e8368714f5876b935c77766a13292a589b5c Mon Sep 17 00:00:00 2001 From: Al Viro Date: Sat, 23 Oct 2010 15:26:21 -0400 Subject: [PATCH] --- yaml --- r: 217795 b: refs/heads/master c: 89b0fc38cca4e6c92a90b58960881ffc5dddd89c h: refs/heads/master i: 217793: 92377dad84f9523d66454fa3db3628f1eb698868 217791: 0b2e44e35e3e26af74f301f875e684745d7a3b75 v: v3 --- [refs] | 2 +- trunk/fs/hfs/hfs_fs.h | 2 -- trunk/fs/hfs/inode.c | 2 +- trunk/fs/hfs/super.c | 1 - 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 45b6056dbb9c..032da356e8f9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 756acc2d61712a8cafe2aa6ad626c60a185d3645 +refs/heads/master: 89b0fc38cca4e6c92a90b58960881ffc5dddd89c diff --git a/trunk/fs/hfs/hfs_fs.h b/trunk/fs/hfs/hfs_fs.h index 1efcbc765d3c..c8cffb81e849 100644 --- a/trunk/fs/hfs/hfs_fs.h +++ b/trunk/fs/hfs/hfs_fs.h @@ -147,8 +147,6 @@ struct hfs_sb_info { u16 blockoffset; int fs_div; - - struct hlist_head rsrc_inodes; }; #define HFS_FLG_BITMAP_DIRTY 0 diff --git a/trunk/fs/hfs/inode.c b/trunk/fs/hfs/inode.c index 397b7adc7ce6..dffb4e996643 100644 --- a/trunk/fs/hfs/inode.c +++ b/trunk/fs/hfs/inode.c @@ -524,7 +524,7 @@ static struct dentry *hfs_file_lookup(struct inode *dir, struct dentry *dentry, HFS_I(inode)->rsrc_inode = dir; HFS_I(dir)->rsrc_inode = inode; igrab(dir); - hlist_add_head(&inode->i_hash, &HFS_SB(dir->i_sb)->rsrc_inodes); + hlist_add_fake(&inode->i_hash); mark_inode_dirty(inode); out: d_add(dentry, inode); diff --git a/trunk/fs/hfs/super.c b/trunk/fs/hfs/super.c index 33254160f650..6ee1586f2334 100644 --- a/trunk/fs/hfs/super.c +++ b/trunk/fs/hfs/super.c @@ -382,7 +382,6 @@ static int hfs_fill_super(struct super_block *sb, void *data, int silent) return -ENOMEM; sb->s_fs_info = sbi; - INIT_HLIST_HEAD(&sbi->rsrc_inodes); res = -EINVAL; if (!parse_options((char *)data, sbi)) {