diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2010-07-26 12:06:00 +0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2010-10-29 04:16:48 -0400 |
| commit | e5a0726a953daf224ae42bcf5edaa64f71b4e8a7 (patch) | |
| tree | 0f0be6f8e0b2324b5e29ac959837ab470afa0053 /fs/logfs | |
| parent | 7d945a3aa7608f68dba04083d3421e0b43052660 (diff) | |
| download | op-kernel-dev-e5a0726a953daf224ae42bcf5edaa64f71b4e8a7.zip op-kernel-dev-e5a0726a953daf224ae42bcf5edaa64f71b4e8a7.tar.gz | |
logfs: fix a leak in get_sb
a) switch ->put_device() to logfs_super *
b) actually call it on early failures in logfs_get_sb_device()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/logfs')
| -rw-r--r-- | fs/logfs/dev_bdev.c | 4 | ||||
| -rw-r--r-- | fs/logfs/dev_mtd.c | 4 | ||||
| -rw-r--r-- | fs/logfs/logfs.h | 3 | ||||
| -rw-r--r-- | fs/logfs/super.c | 4 |
4 files changed, 8 insertions, 7 deletions
diff --git a/fs/logfs/dev_bdev.c b/fs/logfs/dev_bdev.c index 223b673..92ca6fb 100644 --- a/fs/logfs/dev_bdev.c +++ b/fs/logfs/dev_bdev.c @@ -298,9 +298,9 @@ static int bdev_write_sb(struct super_block *sb, struct page *page) return sync_request(page, bdev, WRITE); } -static void bdev_put_device(struct super_block *sb) +static void bdev_put_device(struct logfs_super *s) { - close_bdev_exclusive(logfs_super(sb)->s_bdev, FMODE_READ|FMODE_WRITE); + close_bdev_exclusive(s->s_bdev, FMODE_READ|FMODE_WRITE); } static int bdev_can_write_buf(struct super_block *sb, u64 ofs) diff --git a/fs/logfs/dev_mtd.c b/fs/logfs/dev_mtd.c index 9e3dbe3..7466e9d 100644 --- a/fs/logfs/dev_mtd.c +++ b/fs/logfs/dev_mtd.c @@ -230,9 +230,9 @@ static void mtd_writeseg(struct super_block *sb, u64 ofs, size_t len) __mtd_writeseg(sb, ofs, ofs >> PAGE_SHIFT, len >> PAGE_SHIFT); } -static void mtd_put_device(struct super_block *sb) +static void mtd_put_device(struct logfs_super *s) { - put_mtd_device(logfs_super(sb)->s_mtd); + put_mtd_device(s->s_mtd); } static int mtd_can_write_buf(struct super_block *sb, u64 ofs) diff --git a/fs/logfs/logfs.h b/fs/logfs/logfs.h index 5d2e66b..446c0f1 100644 --- a/fs/logfs/logfs.h +++ b/fs/logfs/logfs.h @@ -136,6 +136,7 @@ struct logfs_area_ops { int (*erase_segment)(struct logfs_area *area); }; +struct logfs_super; /* forward */ /** * struct logfs_device_ops - device access operations * @@ -156,7 +157,7 @@ struct logfs_device_ops { int ensure_write); int (*can_write_buf)(struct super_block *sb, u64 ofs); void (*sync)(struct super_block *sb); - void (*put_device)(struct super_block *sb); + void (*put_device)(struct logfs_super *s); }; /** diff --git a/fs/logfs/super.c b/fs/logfs/super.c index f57a150..f07d40e 100644 --- a/fs/logfs/super.c +++ b/fs/logfs/super.c @@ -529,7 +529,7 @@ static void logfs_kill_sb(struct super_block *sb) logfs_cleanup_rw(sb); if (super->s_erase_page) __free_page(super->s_erase_page); - super->s_devops->put_device(sb); + super->s_devops->put_device(super); logfs_mempool_destroy(super->s_btree_pool); logfs_mempool_destroy(super->s_alias_pool); kfree(super); @@ -586,8 +586,8 @@ err1: deactivate_locked_super(sb); return err; err0: + super->s_devops->put_device(super); kfree(super); - //devops->put_device(sb); return err; } |
