summaryrefslogtreecommitdiff
path: root/fs/logfs/super.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2012-02-07 08:59:29 (GMT)
committerIngo Molnar <mingo@elte.hu>2012-02-07 08:59:29 (GMT)
commit290436c9c61ac983b1bd425da67242a4357c7701 (patch)
tree35e1f189b62eb50515600ad607d7fb57fc547870 /fs/logfs/super.c
parent623ec991ce0e8cd5791bad656c162fa837635907 (diff)
parent62aa2b537c6f5957afd98e29f96897419ed5ebab (diff)
downloadlinux-fsl-qoriq-290436c9c61ac983b1bd425da67242a4357c7701.tar.xz
Merge tag 'v3.3-rc2' into perf/core
Linux 3.3-rc2 Pick up the latest fixes. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'fs/logfs/super.c')
-rw-r--r--fs/logfs/super.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/logfs/super.c b/fs/logfs/super.c
index e795c234..c9ee7f5 100644
--- a/fs/logfs/super.c
+++ b/fs/logfs/super.c
@@ -486,14 +486,15 @@ static void logfs_kill_sb(struct super_block *sb)
/* Alias entries slow down mount, so evict as many as possible */
sync_filesystem(sb);
logfs_write_anchor(sb);
+ free_areas(sb);
/*
* From this point on alias entries are simply dropped - and any
* writes to the object store are considered bugs.
*/
- super->s_flags |= LOGFS_SB_FLAG_SHUTDOWN;
log_super("LogFS: Now in shutdown\n");
generic_shutdown_super(sb);
+ super->s_flags |= LOGFS_SB_FLAG_SHUTDOWN;
BUG_ON(super->s_dirty_used_bytes || super->s_dirty_free_bytes);