linux-ext4.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Curt Wohlgemuth <curtw@google.com>
To: Theodore Tso <tytso@mit.edu>
Cc: ext4 development <linux-ext4@vger.kernel.org>
Subject: [PATCH] ext4: fix ext4_dirty_inode() compile warning
Date: Fri, 2 Oct 2009 09:22:18 -0700	[thread overview]
Message-ID: <6601abe90910020922g4e6a59e7mcc4eeda5cd7b4d1f@mail.gmail.com> (raw)

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@google.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@google.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);

             reply	other threads:[~2009-10-02 16:22 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-10-02 16:22 Curt Wohlgemuth [this message]
2009-10-03  1:09 ` [PATCH] ext4: fix ext4_dirty_inode() compile warning Theodore Tso

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=6601abe90910020922g4e6a59e7mcc4eeda5cd7b4d1f@mail.gmail.com \
    --to=curtw@google.com \
    --cc=linux-ext4@vger.kernel.org \
    --cc=tytso@mit.edu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).