Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 358981
b: refs/heads/master
c: d6212a5
h: refs/heads/master
i:
  358979: 4d66250
v: v3
  • Loading branch information
Changman Lee authored and Jaegeuk Kim committed Feb 11, 2013
1 parent 3a0dce6 commit fe4fb3a
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a2617dc6863b21a8109c199ab533b3dbfe178f27
refs/heads/master: d6212a5f18c8f9f9cc884070a96e11907711217f
5 changes: 5 additions & 0 deletions trunk/fs/f2fs/gc.c
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,11 @@ static int gc_thread_func(void *data)
if (kthread_should_stop())
break;

if (sbi->sb->s_writers.frozen >= SB_FREEZE_WRITE) {
wait_ms = GC_THREAD_MAX_SLEEP_TIME;
continue;
}

f2fs_balance_fs(sbi);

if (!test_opt(sbi, BG_GC))
Expand Down
2 changes: 2 additions & 0 deletions trunk/fs/f2fs/inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -278,13 +278,15 @@ void f2fs_evict_inode(struct inode *inode)
if (inode->i_nlink || is_bad_inode(inode))
goto no_delete;

sb_start_intwrite(inode->i_sb);
set_inode_flag(F2FS_I(inode), FI_NO_ALLOC);
i_size_write(inode, 0);

if (F2FS_HAS_BLOCKS(inode))
f2fs_truncate(inode);

remove_inode_page(inode);
sb_end_intwrite(inode->i_sb);
no_delete:
clear_inode(inode);
}
18 changes: 18 additions & 0 deletions trunk/fs/f2fs/super.c
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,22 @@ int f2fs_sync_fs(struct super_block *sb, int sync)
return 0;
}

static int f2fs_freeze(struct super_block *sb)
{
int err;

if (sb->s_flags & MS_RDONLY)
return 0;

err = f2fs_sync_fs(sb, 1);
return err;
}

static int f2fs_unfreeze(struct super_block *sb)
{
return 0;
}

static int f2fs_statfs(struct dentry *dentry, struct kstatfs *buf)
{
struct super_block *sb = dentry->d_sb;
Expand Down Expand Up @@ -213,6 +229,8 @@ static struct super_operations f2fs_sops = {
.evict_inode = f2fs_evict_inode,
.put_super = f2fs_put_super,
.sync_fs = f2fs_sync_fs,
.freeze_fs = f2fs_freeze,
.unfreeze_fs = f2fs_unfreeze,
.statfs = f2fs_statfs,
};

Expand Down

0 comments on commit fe4fb3a

Please sign in to comment.