summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorRyusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>2009-11-08 12:09:24 +0900
committerRyusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>2009-11-08 19:04:25 +0900
commitc083234f1592ef3fad3d8083663c5e4a357ec77c (patch)
tree8c90897b1fa11920a4edbf043aa59a5123eaa2cb /fs
parent5399dd1fc8f5e812db931225ef5f67d89f3b1a56 (diff)
downloadop-kernel-dev-c083234f1592ef3fad3d8083663c5e4a357ec77c.zip
op-kernel-dev-c083234f1592ef3fad3d8083663c5e4a357ec77c.tar.gz
nilfs2: fix missing cleanup of gc cache on error cases
This fixes an -rc1 regression brought by the commit: 1cf58fa840472ec7df6bf2312885949ebb308853 ("nilfs2: shorten freeze period due to GC in write operation v3"). Although the patch moved out a function call of nilfs_ioctl_move_blocks() to nilfs_ioctl_clean_segments() from nilfs_ioctl_prepare_clean_segments(), it didn't move corresponding cleanup job needed for the error case. This will move the missing cleanup job to the destination function. Signed-off-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp> Acked-by: Jiro SEKIBA <jir@unicus.jp>
Diffstat (limited to 'fs')
-rw-r--r--fs/nilfs2/ioctl.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/nilfs2/ioctl.c b/fs/nilfs2/ioctl.c
index 89dd73e..d24057d 100644
--- a/fs/nilfs2/ioctl.c
+++ b/fs/nilfs2/ioctl.c
@@ -467,7 +467,6 @@ int nilfs_ioctl_prepare_clean_segments(struct the_nilfs *nilfs,
return 0;
failed:
- nilfs_remove_all_gcinode(nilfs);
printk(KERN_ERR "NILFS: GC failed during preparation: %s: err=%d\n",
msg, ret);
return ret;
@@ -556,6 +555,8 @@ static int nilfs_ioctl_clean_segments(struct inode *inode, struct file *filp,
else
ret = nilfs_clean_segments(inode->i_sb, argv, kbufs);
+ if (ret < 0)
+ nilfs_remove_all_gcinode(nilfs);
clear_nilfs_gc_running(nilfs);
out_free:
OpenPOWER on IntegriCloud