diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-09-10 11:56:02 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-09-10 11:56:02 +1000 |
| commit | e071a56c7a4d93bd2ed5384f093bf7fb24ab2e1f (patch) | |
| tree | ca91fce2b067beee4c5e2a38630399c81d0faf21 /fs | |
| parent | eff75597ae5fe261b717e4d6b6f9ca359e1e6993 (diff) | |
| parent | 339466142b3f58fe0ee4dea7e8c5f3d33099e89c (diff) | |
Merge remote-tracking branch 'logfs/master'
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/logfs/dev_mtd.c | 2 | ||||
| -rw-r--r-- | fs/logfs/super.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/fs/logfs/dev_mtd.c b/fs/logfs/dev_mtd.c index 9c501449450d..427bb73e298f 100644 --- a/fs/logfs/dev_mtd.c +++ b/fs/logfs/dev_mtd.c @@ -245,8 +245,8 @@ static int logfs_mtd_can_write_buf(struct super_block *sb, u64 ofs) goto out; if (memchr_inv(buf, 0xff, super->s_writesize)) err = -EIO; - kfree(buf); out: + kfree(buf); return err; } diff --git a/fs/logfs/super.c b/fs/logfs/super.c index 54360293bcb5..b256c0690e5b 100644 --- a/fs/logfs/super.c +++ b/fs/logfs/super.c @@ -287,14 +287,14 @@ static int logfs_make_writeable(struct super_block *sb) if (err) return err; + /* Do one GC pass before any data gets dirtied */ + logfs_gc_pass(sb); + /* Check areas for trailing unaccounted data */ err = logfs_check_areas(sb); if (err) return err; - /* Do one GC pass before any data gets dirtied */ - logfs_gc_pass(sb); - /* after all initializations are done, replay the journal * for rw-mounts, if necessary */ err = logfs_replay_journal(sb); |