diff options
| author | Steven Rostedt <srostedt@redhat.com> | 2013-02-13 22:35:52 -0500 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2013-02-13 22:35:52 -0500 |
| commit | 8cb4165817e9260dd8f6f09f3d28328f10811f89 (patch) | |
| tree | 450133f83d336b6986f041d726457f090cff97f2 /fs | |
| parent | 3568cae0aa56660cadd607e19096ad853822b28c (diff) | |
| parent | a96dbfbcb58afeec72c2a0a03d205e0e1457ea3d (diff) | |
Merge tag 'v3.0.63' into v3.0-rt
This is the 3.0.63 stable release
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/nilfs2/ioctl.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/nilfs2/ioctl.c b/fs/nilfs2/ioctl.c index 0d1c9bdbb797..cee648eb403a 100644 --- a/fs/nilfs2/ioctl.c +++ b/fs/nilfs2/ioctl.c @@ -661,8 +661,11 @@ static int nilfs_ioctl_clean_segments(struct inode *inode, struct file *filp, if (ret < 0) printk(KERN_ERR "NILFS: GC failed during preparation: " "cannot read source blocks: err=%d\n", ret); - else + else { + if (nilfs_sb_need_update(nilfs)) + set_nilfs_discontinued(nilfs); ret = nilfs_clean_segments(inode->i_sb, argv, kbufs); + } nilfs_remove_all_gcinodes(nilfs); clear_nilfs_gc_running(nilfs); |