diff options
| author |   Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-24 15:28:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-24 15:28:50 -0700 |
| commit | b7a818e4fcd2c3ee8c34c2367d345561c4c76a15 (patch) | |
| tree | 7d05ad4a8eadd18cce315af47ccd91304c4f72c3 /Makefile | |
| parent | Merge git://git.infradead.org/~dwmw2/khdrs-2.6 (diff) | |
| parent | ocfs2: Teach ocfs2_drop_lock() to use ->set_lvb() callback (diff) | |
| download | linux-dev-b7a818e4fcd2c3ee8c34c2367d345561c4c76a15.tar.xz linux-dev-b7a818e4fcd2c3ee8c34c2367d345561c4c76a15.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: (28 commits)
ocfs2: Teach ocfs2_drop_lock() to use ->set_lvb() callback
ocfs2: Remove ->unblock lockres operation
ocfs2: move downconvert worker to lockres ops
ocfs2: Remove unused dlmglue functions
ocfs2: Have the metadata lock use generic dlmglue functions
ocfs2: Add ->set_lvb callback in dlmglue
ocfs2: Add ->check_downconvert callback in dlmglue
ocfs2: Check for refreshing locks in generic unblock function
ocfs2: don't unconditionally pass LVB flags
ocfs2: combine inode and generic blocking AST functions
ocfs2: Add ->get_osb() dlmglue locking operation
ocfs2: remove ->unlock_ast() callback from ocfs2_lock_res_ops
ocfs2: combine inode and generic AST functions
ocfs2: Clean up lock resource refresh flags
ocfs2: Remove i_generation from inode lock names
ocfs2: Encode i_generation in the meta data lvb
ocfs2: Free up some space in the lvb
ocfs2: Remove special casing for inode creation in ocfs2_dentry_attach_lock()
ocfs2: manually d_move() during ocfs2_rename()
[PATCH] Allow file systems to manually d_move() inside of ->rename()
...
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions