Skip to contentSkip to conversation

ocfs2: Set journal descriptor to NULL after journal shutdown

PATCH New Sunil Mushran 2 participants 3 messages Oct 22, 2008 – Oct 24, 2008 OCFS2

lore
Share & tools
lore

Sunil Mushran

author
#0 lore raw

PATCH 1/1 ocfs2: Set journal descriptor to NULL after journal shutdown

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 <[email protected]>
---
 fs/ocfs2/inode.c   |    6 ++++++
 fs/ocfs2/journal.c |    1 +
 2 files changed, 7 insertions(+), 0 deletions(-)
fs/ocfs2/inode.c +6 -0
index 4903688..7aa00d5 100644
@@ -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);
fs/ocfs2/journal.c +1 -0
index 81e4067..99fe9d5 100644
@@ -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--;
Signature · 1 line
1.5.4.3
#1 lore raw

PATCH 1/1 ocfs2: Set journal descriptor to NULL after journal shutdown

Quoted 6 lines · Sunil Mushran

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 <[email protected]>
Signed-off-by Joel Becker <[email protected]>
Quoted 42 lines
---
 fs/ocfs2/inode.c   |    6 ++++++
 fs/ocfs2/journal.c |    1 +
 2 files changed, 7 insertions(+), 0 deletions(-)
fs/ocfs2/inode.c +6 -0
index 4903688..7aa00d5 100644
@@ -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);
fs/ocfs2/journal.c +1 -0
index 81e4067..99fe9d5 100644
@@ -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--;
Signature · 7 lines
1.5.4.3


_______________________________________________
Ocfs2-devel mailing list
Ocfs2-devel at oss.oracle.com
http://oss.oracle.com/mailman/listinfo/ocfs2-devel
Signature · 8 lines
"If at first you don't succeed, cover all traces that you tried."
                                                        -Unknown

Joel Becker
Principal Software Developer
Oracle
E-mail: joel.becker at oracle.com
Phone: (650) 506-8127
#2 lore raw

PATCH 1/1 ocfs2: Set journal descriptor to NULL after journal shutdown

In reply to Sunil Mushran
Quoted 6 lines · Sunil Mushran

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 <[email protected]>

This is now in my xattr-28 branch.

Joel

Signature · 10 lines
Life's Little Instruction Book #197

	"Don't forget, a person's greatest emotional need is to 
	 feel appreciated."

Joel Becker
Principal Software Developer
Oracle
E-mail: joel.becker at oracle.com
Phone: (650) 506-8127