summaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.osdl.org>2006-12-04 19:33:45 -0800
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-04 19:33:45 -0800
commit651857a1ecaf97a8ad9d324dd2a61675c53e541e (patch)
treef5b7e4915b25ae6910ede2bf37614ca98ab4f6e5 /block
parentee28b0da1069ced1688aa9d0b7b378353b988321 (diff)
parentd38eb8db6aa359c060dfb72a29cf8d94a96657d8 (diff)
downloadlinux-3.10-651857a1ecaf97a8ad9d324dd2a61675c53e541e.tar.gz
linux-3.10-651857a1ecaf97a8ad9d324dd2a61675c53e541e.tar.bz2
linux-3.10-651857a1ecaf97a8ad9d324dd2a61675c53e541e.zip
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2: (31 commits) ocfs2: implement i_op->permission configfs: make configfs_dirent_exists() static ocfs2: update file system paths to set atime ocfs2: core atime update functions ocfs2: Add splice support ocfs2: Remove ocfs2_write_should_remove_suid() [PATCH] Export should_remove_suid() configfs: mutex_lock_nested() fix ocfs2: Remove struct ocfs2_journal_handle in favor of handle_t ocfs2: remove handle argument to ocfs2_start_trans() ocfs2: remove ocfs2_journal_handle journal field ocfs2: pass ocfs2_super * into ocfs2_commit_trans() ocfs2: remove unused handle argument from ocfs2_meta_lock_full() ocfs2: make ocfs2_alloc_handle() static ocfs2: remove unused ocfs2_handle_add_lock() ocfs2: remove unused ocfs2_handle_add_inode() ocfs2: Don't allocate handle early in ocfs2_rename() ocfs2: don't use handle for locking in allocation functions ocfs2: don't pass handle to ocfs2_meta_lock in ocfs2_rename() ocfs2: don't pass handle to ocfs2_meta_lock in ocfs2_symlink() ...
Diffstat (limited to 'block')
0 files changed, 0 insertions, 0 deletions