linux-ext4 - [PATCH] ext4: fix ext4_dirty

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <6601abe90910020922g4e6a59e7mcc4eeda5cd7b4d1f@mail.gmail.com>
Date:	Fri, 2 Oct 2009 09:22:18 -0700
From:	Curt Wohlgemuth <curtw@...gle.com>
To:	Theodore Tso <tytso@....edu>
Cc:	ext4 development <linux-ext4@...r.kernel.org>
Subject: [PATCH] ext4: fix ext4_dirty_inode() compile warning

Hi Ted:

Apparently my patch for

   ext4: Make sure ext4_dirty_inode() updates the inode in no journal mode

didn't play well if CONFIG_JBD_DEBUG wasn't defined.

Here are two patches that fix it.  I don't know if the jbd_debug() call has
any importance or not; you can choose which is better perhaps?

Thanks,
Curt

==============================================

Remove jbd_debug() call from ext4_inode_dirty()

	Signed-off-by: Curt Wohlgemuth <curtw@...gle.com>

--- fs/ext4/inode.c.orig	2009-10-02 09:04:36.000000000 -0700
+++ fs/ext4/inode.c	2009-10-02 09:05:31.000000000 -0700
@@ -5851,14 +5851,12 @@ int ext4_mark_inode_dirty(handle_t *hand
  */
 void ext4_dirty_inode(struct inode *inode)
 {
-	handle_t *current_handle = ext4_journal_current_handle();
 	handle_t *handle;

 	handle = ext4_journal_start(inode, 2);
 	if (IS_ERR(handle))
 		goto out;

-	jbd_debug(5, "marking dirty.  outer handle=%p\n", current_handle);
 	ext4_mark_inode_dirty(handle, inode);

 	ext4_journal_stop(handle);

==============================================

Make sure ext4_inode_dirty() compiles if CONFIG_JBD_DEBUG is not defined.

	Signed-off-by: Curt Wohlgemuth <curtw@...gle.com>

--- fs/ext4/inode.c.orig	2009-10-02 09:04:36.000000000 -0700
+++ fs/ext4/inode.c	2009-10-02 09:07:31.000000000 -0700
@@ -5851,7 +5851,9 @@ int ext4_mark_inode_dirty(handle_t *hand
  */
 void ext4_dirty_inode(struct inode *inode)
 {
+#ifdef CONFIG_JBD_DEBUG
 	handle_t *current_handle = ext4_journal_current_handle();
+#endif
 	handle_t *handle;

 	handle = ext4_journal_start(inode, 2);
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html