diff options
author | Chao Yu <yuchao0@huawei.com> | 2018-01-17 09:28:52 -0500 |
---|---|---|
committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2018-01-22 17:56:54 -0500 |
commit | d027c48447c2c2fab2b2aa1833436cf24ea567e9 (patch) | |
tree | efce3f30869678a5c0f1f435692a53c1be94e509 | |
parent | bb9e3bb8dbf5975a493e4e2dfbb900018579890c (diff) |
f2fs: hanlde error case in f2fs_ioc_shutdown
This patch makes f2fs_ioc_shutdown handling error case correctly.
Signed-off-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
-rw-r--r-- | fs/f2fs/file.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c index f31f0590cdc7..e20b01acbd2c 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c | |||
@@ -1839,14 +1839,20 @@ static int f2fs_ioc_shutdown(struct file *filp, unsigned long arg) | |||
1839 | switch (in) { | 1839 | switch (in) { |
1840 | case F2FS_GOING_DOWN_FULLSYNC: | 1840 | case F2FS_GOING_DOWN_FULLSYNC: |
1841 | sb = freeze_bdev(sb->s_bdev); | 1841 | sb = freeze_bdev(sb->s_bdev); |
1842 | if (sb && !IS_ERR(sb)) { | 1842 | if (IS_ERR(sb)) { |
1843 | ret = PTR_ERR(sb); | ||
1844 | goto out; | ||
1845 | } | ||
1846 | if (sb) { | ||
1843 | f2fs_stop_checkpoint(sbi, false); | 1847 | f2fs_stop_checkpoint(sbi, false); |
1844 | thaw_bdev(sb->s_bdev, sb); | 1848 | thaw_bdev(sb->s_bdev, sb); |
1845 | } | 1849 | } |
1846 | break; | 1850 | break; |
1847 | case F2FS_GOING_DOWN_METASYNC: | 1851 | case F2FS_GOING_DOWN_METASYNC: |
1848 | /* do checkpoint only */ | 1852 | /* do checkpoint only */ |
1849 | f2fs_sync_fs(sb, 1); | 1853 | ret = f2fs_sync_fs(sb, 1); |
1854 | if (ret) | ||
1855 | goto out; | ||
1850 | f2fs_stop_checkpoint(sbi, false); | 1856 | f2fs_stop_checkpoint(sbi, false); |
1851 | break; | 1857 | break; |
1852 | case F2FS_GOING_DOWN_NOSYNC: | 1858 | case F2FS_GOING_DOWN_NOSYNC: |