]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
ext3 quota support: fix compile failure
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 23 Oct 2008 18:48:56 +0000 (11:48 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 23 Oct 2008 18:48:56 +0000 (11:48 -0700)
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 <torvalds@linux-foundation.org>
fs/ext3/super.c

index 8147dd44cedea34fe51004505766ec23e06c169d..18eaa78ecb4ec53d4d65170ccfd28a362ae703f9 100644 (file)
@@ -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;
                }
        }