* [PATCH] ext3: fix compilation with quotas enabled
@ 2008-10-23 18:28 Christoph Hellwig
0 siblings, 0 replies; only message in thread
From: Christoph Hellwig @ 2008-10-23 18:28 UTC (permalink / raw)
To: torvalds; +Cc: linux-ext4
An error path ext3_quota_on reference the nd variable that is gone now.
Instead of fixing this in place change the code slightly so that we use
one single callsite for path_put instead of three.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Index: linux-2.6/fs/ext3/super.c
===================================================================
--- linux-2.6.orig/fs/ext3/super.c 2008-10-23 20:23:04.000000000 +0200
+++ linux-2.6/fs/ext3/super.c 2008-10-23 20:28:20.000000000 +0200
@@ -2811,9 +2811,10 @@ static int ext3_quota_on(struct super_bl
/* Quotafile not on the same filesystem? */
if (path.mnt->mnt_sb != sb) {
- path_put(&path);
- return -EXDEV;
+ err = -EXDEV;
+ goto out_path_put;
}
+
/* Journaling quota? */
if (EXT3_SB(sb)->s_qf_names[type]) {
/* Quotafile not of fs root? */
@@ -2835,13 +2836,12 @@ static int ext3_quota_on(struct super_bl
journal_lock_updates(EXT3_SB(sb)->s_journal);
err = journal_flush(EXT3_SB(sb)->s_journal);
journal_unlock_updates(EXT3_SB(sb)->s_journal);
- if (err) {
- path_put(&nd.path);
- return err;
- }
+ if (err)
+ goto out_path_put;
}
err = vfs_quota_on_path(sb, type, format_id, &path);
+ out_path_put:
path_put(&path);
return err;
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2008-10-23 18:28 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-10-23 18:28 [PATCH] ext3: fix compilation with quotas enabled Christoph Hellwig
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).