Merge tag 'for-f2fs-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs

Linux Kernel / Linux Kernel - Linus Torvalds [linux-foundation.org] - 13 November 2013 00:24 EST

dd1d139 Merge tag 'for-f2fs-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs

Documentation/filesystems/f2fs.txt | 7 ++
fs/f2fs/Kconfig | 8 ++
fs/f2fs/acl.c | 36 ++++-----
fs/f2fs/acl.h | 9 ++-
fs/f2fs/checkpoint.c | 75 +++++++++----------
fs/f2fs/data.c | 29 +++-----
fs/f2fs/dir.c | 4 +-
fs/f2fs/f2fs.h | 117 ++++++++++++++++-------------
fs/f2fs/file.c | 45 ++++++------
fs/f2fs/gc.c | 31 ++++----
fs/f2fs/inode.c | 62 ++++++++++------
fs/f2fs/namei.c | 52 +++++++------
fs/f2fs/node.c | 142 ++++++++++++++++++++++-------------
fs/f2fs/recovery.c | 45 +++++++-----
fs/f2fs/segment.c | 133 +++++++++++++++++----------------
fs/f2fs/segment.h | 38 ++++++++--
fs/f2fs/super.c | 143 +++++++++++++++++++++++++-----------
fs/f2fs/xattr.c | 36 ++++++---
include/trace/events/f2fs.h | 51 +++++++++++++
19 files changed, 651 insertions(+), 412 deletions(-)

Upstream: git.kernel.org


  • Share