aboutsummaryrefslogtreecommitdiffstats
path: root/fs/f2fs/Kconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-09-03 10:10:28 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-09-03 10:10:28 -0700
commit70c8038dd698b44daf7c8fc7e2eca142bec694c4 (patch)
treeb1bbdfe2396d67e7862019512f3e5b436c360e7c /fs/f2fs/Kconfig
parent5a147c9f57bab06183b2bdde78aa49f3e332a557 (diff)
parentb73e52824c8920a5ff754e3c8ff68466a7dd61f9 (diff)
downloadkernel_i9300_mainline-70c8038dd698b44daf7c8fc7e2eca142bec694c4.zip
kernel_i9300_mainline-70c8038dd698b44daf7c8fc7e2eca142bec694c4.tar.gz
kernel_i9300_mainline-70c8038dd698b44daf7c8fc7e2eca142bec694c4.tar.bz2
Merge tag 'for-f2fs-3.17-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs
Pull f2fs bug fixes from Jaegeuk Kim: "This series includes patches to: - fix recovery routines - fix bugs related to inline_data/xattr - fix when casting the dentry names - handle EIO or ENOMEM correctly - fix memory leak - fix lock coverage" * tag 'for-f2fs-3.17-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs: (28 commits) f2fs: reposition unlock_new_inode to prevent accessing invalid inode f2fs: fix wrong casting for dentry name f2fs: simplify by using a literal f2fs: truncate stale block for inline_data f2fs: use macro for code readability f2fs: introduce need_do_checkpoint for readability f2fs: fix incorrect calculation with total/free inode num f2fs: remove rename and use rename2 f2fs: skip if inline_data was converted already f2fs: remove rewrite_node_page f2fs: avoid double lock in truncate_blocks f2fs: prevent checkpoint during roll-forward f2fs: add WARN_ON in f2fs_bug_on f2fs: handle EIO not to break fs consistency f2fs: check s_dirty under cp_mutex f2fs: unlock_page when node page is redirtied out f2fs: introduce f2fs_cp_error for readability f2fs: give a chance to mount again when encountering errors f2fs: trigger release_dirty_inode in f2fs_put_super f2fs: don't skip checkpoint if there is no dirty node pages ...
Diffstat (limited to 'fs/f2fs/Kconfig')
-rw-r--r--fs/f2fs/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/f2fs/Kconfig b/fs/f2fs/Kconfig
index 214fe10..736a348 100644
--- a/fs/f2fs/Kconfig
+++ b/fs/f2fs/Kconfig
@@ -23,7 +23,7 @@ config F2FS_STAT_FS
mounted as f2fs. Each file shows the whole f2fs information.
/sys/kernel/debug/f2fs/status includes:
- - major file system information managed by f2fs currently
+ - major filesystem information managed by f2fs currently
- average SIT information about whole segments
- current memory footprint consumed by f2fs.
@@ -68,6 +68,6 @@ config F2FS_CHECK_FS
bool "F2FS consistency checking feature"
depends on F2FS_FS
help
- Enables BUG_ONs which check the file system consistency in runtime.
+ Enables BUG_ONs which check the filesystem consistency in runtime.
If you want to improve the performance, say N.