summaryrefslogtreecommitdiffstats
path: root/fs/ext3/super.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-10-23 20:48:56 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2008-10-23 20:48:56 +0200
commit12e1ec9ff31d388305da644b452c9f80d244aa55 (patch)
tree9e5fa992d12885a6b1c16c1175c692f99ac03bd7 /fs/ext3/super.c
parentMerge branch 'v28-range-hrtimers-for-linus-v2' of git://git.kernel.org/pub/sc... (diff)
downloadlinux-12e1ec9ff31d388305da644b452c9f80d244aa55.tar.xz
linux-12e1ec9ff31d388305da644b452c9f80d244aa55.zip
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 <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/ext3/super.c')
-rw-r--r--fs/ext3/super.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext3/super.c b/fs/ext3/super.c
index 8147dd44cede..18eaa78ecb4e 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;
}
}