Re: [PATCH] ReiserFS: Make sure all dentries refs are released before calling kill_block_super()

["Rafael J. Wysocki" <rjw@sisk.pl>]

On Wednesday 09 August 2006 12:14, David Howells wrote:
> Rafael J. Wysocki <rjw@sisk.pl> wrote:
> 
> > It didn't apply cleanly to -rc3-mm2 for me and produces the appended oops
> > every time at the kernel startup (on x86_64).
> 
> Can you send me your modified patch?

Index: linux-2.6.18-rc3-mm2/fs/reiserfs/super.c
===================================================================
--- linux-2.6.18-rc3-mm2.orig/fs/reiserfs/super.c
+++ linux-2.6.18-rc3-mm2/fs/reiserfs/super.c
@@ -430,21 +430,29 @@ int remove_save_link(struct inode *inode
 	return journal_end(&th, inode->i_sb, JOURNAL_PER_BALANCE_CNT);
 }
 
-static void reiserfs_put_super(struct super_block *s)
+static void reiserfs_kill_sb(struct super_block *s)
 {
-	struct reiserfs_transaction_handle th;
-	th.t_trans_id = 0;
-
 	if (REISERFS_SB(s)->xattr_root) {
 		d_invalidate(REISERFS_SB(s)->xattr_root);
 		dput(REISERFS_SB(s)->xattr_root);
+		REISERFS_SB(s)->xattr_root = NULL;
 	}
 
 	if (REISERFS_SB(s)->priv_root) {
 		d_invalidate(REISERFS_SB(s)->priv_root);
 		dput(REISERFS_SB(s)->priv_root);
+		REISERFS_SB(s)->priv_root = NULL;
 	}
 
+	kill_block_super(s);
+}
+
+static void reiserfs_put_super(struct super_block *s)
+{
+	int i;
+	struct reiserfs_transaction_handle th;
+	th.t_trans_id = 0;
+
 	/* change file system state to current state if it was mounted with read-write permissions */
 	if (!(s->s_flags & MS_RDONLY)) {
 		if (!journal_begin(&th, s, 10)) {
@@ -2155,7 +2163,7 @@ struct file_system_type reiserfs_fs_type
 	.owner = THIS_MODULE,
 	.name = "reiserfs",
 	.get_sb = get_super_block,
-	.kill_sb = kill_block_super,
+	.kill_sb = reiserfs_kill_sb,
 	.fs_flags = FS_REQUIRES_DEV,
 };