summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2008-12-29 07:40:31 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2009-01-05 11:54:29 -0500
commit5b45d96bf963afeb931a75faf02fb424e446e5a9 (patch)
tree12f77648fc10aad3cc188537ce7a82dc9b3275a3
parentd8e9650dff48055057253ca30933605bd7d0733b (diff)
downloadlinux-stable-5b45d96bf963afeb931a75faf02fb424e446e5a9.tar.gz
linux-stable-5b45d96bf963afeb931a75faf02fb424e446e5a9.tar.bz2
linux-stable-5b45d96bf963afeb931a75faf02fb424e446e5a9.zip
fix the treatment of jfs special inodes
We used to put them on a single list, without any locking. Racy. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--fs/jfs/jfs_imap.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/fs/jfs/jfs_imap.c b/fs/jfs/jfs_imap.c
index d6363d8309d0..0f94381ca6d0 100644
--- a/fs/jfs/jfs_imap.c
+++ b/fs/jfs/jfs_imap.c
@@ -58,9 +58,9 @@
/*
* __mark_inode_dirty expects inodes to be hashed. Since we don't want
- * special inodes in the fileset inode space, we hash them to a dummy head
+ * special inodes in the fileset inode space, we make them appear hashed,
+ * but do not put on any lists.
*/
-static HLIST_HEAD(aggregate_hash);
/*
* imap locks
@@ -496,7 +496,11 @@ struct inode *diReadSpecial(struct super_block *sb, ino_t inum, int secondary)
/* release the page */
release_metapage(mp);
- hlist_add_head(&ip->i_hash, &aggregate_hash);
+ /*
+ * that will look hashed, but won't be on any list; hlist_del()
+ * will work fine and require no locking.
+ */
+ ip->i_hash.pprev = &ip->i_hash.next;
return (ip);
}