diff options
| author | Joern Engel <joern@logfs.org> | 2011-08-05 11:18:19 +0200 |
|---|---|---|
| committer | Prasad Joshi <prasadjoshi.linux@gmail.com> | 2012-01-28 11:42:39 +0530 |
| commit | 1bcceaff8cbe5e5698ccf1015c9a938aa72718c4 (patch) | |
| tree | 2e36c3d9d5577dbfd3998cab37576a8761cf18fa | |
| parent | 6c69494f6b442834f26377e02d43fc8e1272221d (diff) | |
| download | linux-3.10-1bcceaff8cbe5e5698ccf1015c9a938aa72718c4.tar.gz linux-3.10-1bcceaff8cbe5e5698ccf1015c9a938aa72718c4.tar.bz2 linux-3.10-1bcceaff8cbe5e5698ccf1015c9a938aa72718c4.zip | |
logfs: Free areas before calling generic_shutdown_super()
Or hit an assertion in map_invalidatepage() instead.
Signed-off-by: Joern Engel <joern@logfs.org>
| -rw-r--r-- | fs/logfs/logfs.h | 1 | ||||
| -rw-r--r-- | fs/logfs/segment.c | 14 | ||||
| -rw-r--r-- | fs/logfs/super.c | 1 |
3 files changed, 12 insertions, 4 deletions
diff --git a/fs/logfs/logfs.h b/fs/logfs/logfs.h index 0dec29887a8..59ed32cd62d 100644 --- a/fs/logfs/logfs.h +++ b/fs/logfs/logfs.h @@ -596,6 +596,7 @@ int logfs_init_mapping(struct super_block *sb); void logfs_sync_area(struct logfs_area *area); void logfs_sync_segments(struct super_block *sb); void freeseg(struct super_block *sb, u32 segno); +void free_areas(struct super_block *sb); /* area handling */ int logfs_init_areas(struct super_block *sb); diff --git a/fs/logfs/segment.c b/fs/logfs/segment.c index 6aee6092860..ab798ed1cc8 100644 --- a/fs/logfs/segment.c +++ b/fs/logfs/segment.c @@ -862,6 +862,16 @@ static void free_area(struct logfs_area *area) kfree(area); } +void free_areas(struct super_block *sb) +{ + struct logfs_super *super = logfs_super(sb); + int i; + + for_each_area(i) + free_area(super->s_area[i]); + free_area(super->s_journal_area); +} + static struct logfs_area *alloc_area(struct super_block *sb) { struct logfs_area *area; @@ -944,10 +954,6 @@ err: void logfs_cleanup_areas(struct super_block *sb) { struct logfs_super *super = logfs_super(sb); - int i; btree_grim_visitor128(&super->s_object_alias_tree, 0, kill_alias); - for_each_area(i) - free_area(super->s_area[i]); - free_area(super->s_journal_area); } diff --git a/fs/logfs/super.c b/fs/logfs/super.c index f9b7a30b00a..c9ee7f5d1ca 100644 --- a/fs/logfs/super.c +++ b/fs/logfs/super.c @@ -486,6 +486,7 @@ 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 |