From: Linus Torvalds Date: Thu, 23 Oct 2008 18:48:56 +0000 (-0700) Subject: ext3 quota support: fix compile failure X-Git-Tag: v2.6.28-rc1~17 X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?p=linux-2.6-omap-h63xx.git;a=commitdiff_plain;h=12e1ec9ff31d388305da644b452c9f80d244aa55 ext3 quota support: fix compile failure This one was due to a merge error: we added a use of nd.path in commit 2d7c820e56ce83b23daee9eb5343730fb309418e ("ext3: add checks for errors from jbd"), and concurrently we got rid of 'nd' and used a naked 'path' in commit 8264613def2e5c4f12bc3167713090fd172e6055 ("[PATCH] switch quota_on-related stuff to kern_path()"). That all merged cleanly, but it didn't actually _work_. This should fix it. Signed-off-by: Linus Torvalds --- diff --git a/fs/ext3/super.c b/fs/ext3/super.c index 8147dd44ced..18eaa78ecb4 100644 --- a/fs/ext3/super.c +++ b/fs/ext3/super.c @@ -2836,7 +2836,7 @@ static int ext3_quota_on(struct super_block *sb, int type, int format_id, err = journal_flush(EXT3_SB(sb)->s_journal); journal_unlock_updates(EXT3_SB(sb)->s_journal); if (err) { - path_put(&nd.path); + path_put(&path); return err; } }