Hi Linus, Here are the bulk of our ocfs2 changes for 2.6.24-rc1. The biggest feature being added here is inline data support for Ocfs2. This allows the file system to store file and directory data inside of the inode block. Since Ocfs2 (like other similar cluster file systems) has rather large inodes, this saves on space and improves performance on small files and directories. Most of the patches in the inline-data seres are just simple function moves or code refactors designed to allow the final inline data patches to require very little in the way of code duplication. Inline data is treated as a single contigous inode region starting at offset 0. Internally, the file system detects those inodes via an on-disk flag and populates pages from their inode blocks. Writes go in the opposite direction, with the exception that large writes force an inode out to extents. For simplicity, shared writeable mmap and large extending truncates also force the file out to extents. The rest of the patches include: * ->show_options support * Various small cleanups Thanks, --Mark Please pull from 'upstream-linus' branch of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2.git upstream-linus to receive the following updates: fs/ocfs2/alloc.c | 482 ++++++++++++---- fs/ocfs2/alloc.h | 7 fs/ocfs2/aops.c | 309 ++++++++++ fs/ocfs2/aops.h | 6 fs/ocfs2/dir.c | 1423 ++++++++++++++++++++++++++++++++++++++++++++------ fs/ocfs2/dir.h | 48 + fs/ocfs2/dlmglue.c | 2 fs/ocfs2/dlmglue.h | 4 fs/ocfs2/export.c | 8 fs/ocfs2/extent_map.c | 6 fs/ocfs2/file.c | 298 +++++----- fs/ocfs2/file.h | 2 fs/ocfs2/inode.c | 7 fs/ocfs2/inode.h | 1 fs/ocfs2/journal.c | 120 +--- fs/ocfs2/journal.h | 3 fs/ocfs2/namei.c | 552 ++----------------- fs/ocfs2/namei.h | 19 fs/ocfs2/ocfs2.h | 7 fs/ocfs2/ocfs2_fs.h | 64 ++ fs/ocfs2/super.c | 62 +- fs/ocfs2/sysfile.c | 10 22 files changed, 2386 insertions(+), 1054 deletions(-) Denis Cheng (1): fs/ocfs2/: removed unneeded initial value and function's return value Mark Fasheh (19): ocfs2: Remove unused structure field ocfs2: Clear slot map when umounting a local volume ocfs2: Sync ocfs2_fs.h with ocfs2-tools ocfs2: move nonsparse hole-filling into ocfs2_write_begin() ocfs2: Small refactor of truncate zeroing code ocfs2: Move directory manipulation code into dir.c ocfs2: Abstract out core dir listing functionality ocfs2: Pass raw u64 to filldir ocfs2: Remove open coded readdir() ocfs2: Implement ocfs2_empty_dir() as a caller of ocfs2_dir_foreach() ocfs2: Provide convenience function for ino lookup ocfs2: Rename cleanups ocfs2: Cleanup dirent size check ocfs2: Structure updates for inline data ocfs2: Read support for inline data ocfs2: Write support for inline data ocfs2: Read support for directories with inline data ocfs2: Write support for directories with inline data ocfs2: Optionally return filldir errors Sunil Mushran (1): ocfs2: Implement show_options() Tao Mao (2): ocfs2: remove mostly unused field from insert structure ocfs2: remove unused variable