diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-15 09:12:01 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-15 09:12:01 -0800 |
| commit | 53365383c4667aba55385cd1858582c19a7a8a36 (patch) | |
| tree | b290d003534b3947834762c2fb492d9d0beb985f /fs/xfs/xfs_dir2.c | |
| parent | Merge branch 'for-2.6.33' of git://git.kernel.dk/linux-2.6-block (diff) | |
| parent | dm snapshot: use merge origin if snapshot invalid (diff) | |
| download | linux-dev-53365383c4667aba55385cd1858582c19a7a8a36.tar.xz linux-dev-53365383c4667aba55385cd1858582c19a7a8a36.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm
* git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm: (80 commits)
dm snapshot: use merge origin if snapshot invalid
dm snapshot: report merge failure in status
dm snapshot: merge consecutive chunks together
dm snapshot: trigger exceptions in remaining snapshots during merge
dm snapshot: delay merging a chunk until writes to it complete
dm snapshot: queue writes to chunks being merged
dm snapshot: add merging
dm snapshot: permit only one merge at once
dm snapshot: support barriers in snapshot merge target
dm snapshot: avoid allocating exceptions in merge
dm snapshot: rework writing to origin
dm snapshot: add merge target
dm exception store: add merge specific methods
dm snapshot: create function for chunk_is_tracked wait
dm snapshot: make bio optional in __origin_write
dm mpath: reject messages when device is suspended
dm: export suspended state to targets
dm: rename dm_suspended to dm_suspended_md
dm: swap target postsuspend call and setting suspended flag
dm crypt: add plain64 iv
...
Diffstat (limited to 'fs/xfs/xfs_dir2.c')
0 files changed, 0 insertions, 0 deletions