]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
ocfs2: Set journal descriptor to NULL after journal shutdown
authorSunil Mushran <sunil.mushran@oracle.com>
Wed, 22 Oct 2008 20:24:29 +0000 (13:24 -0700)
committerMark Fasheh <mfasheh@suse.com>
Mon, 10 Nov 2008 17:51:47 +0000 (09:51 -0800)
Patch sets journal descriptor to NULL after the journal is shutdown.
This ensures that jbd2_journal_release_jbd_inode(), which removes the
jbd2 inode from txn lists, can be called safely from ocfs2_clear_inode()
even after the journal has been shutdown.

Signed-off-by: Sunil Mushran <sunil.mushran@oracle.com>
Signed-off-by: Joel Becker <joel.becker@oracle.com>
Signed-off-by: Mark Fasheh <mfasheh@suse.com>
fs/ocfs2/inode.c
fs/ocfs2/journal.c

index 4903688f72a9314f03ab66183de3104b54a3eed1..7aa00d5118748f392251acf5b76605350eefcd98 100644 (file)
@@ -1106,6 +1106,12 @@ void ocfs2_clear_inode(struct inode *inode)
        oi->ip_last_trans = 0;
        oi->ip_dir_start_lookup = 0;
        oi->ip_blkno = 0ULL;
+
+       /*
+        * ip_jinode is used to track txns against this inode. We ensure that
+        * the journal is flushed before journal shutdown. Thus it is safe to
+        * have inodes get cleaned up after journal shutdown.
+        */
        jbd2_journal_release_jbd_inode(OCFS2_SB(inode->i_sb)->journal->j_journal,
                                       &oi->ip_jinode);
 
index 81e40677eecbddf989722e51f0336f43d6f84ff8..99fe9d584f3c25843ab1caefcce175f2ccdbb60c 100644 (file)
@@ -690,6 +690,7 @@ void ocfs2_journal_shutdown(struct ocfs2_super *osb)
 
        /* Shutdown the kernel journal system */
        jbd2_journal_destroy(journal->j_journal);
+       journal->j_journal = NULL;
 
        OCFS2_I(inode)->ip_open_count--;