diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-04 16:33:18 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-04 16:33:18 -0700 |
commit | 7572e56314a7e2568f7196862222b45cfb9d6eda (patch) | |
tree | 345bc292de14b24f28d5367f999bcf7500abedc3 /arch/powerpc/sysdev/cpm1.c | |
parent | a66f6375bdeb64d7a56c532bda7c006358845820 (diff) | |
parent | d577632e65ea01fb3b124b652d7bd2381251da3c (diff) | |
download | linux-7572e56314a7e2568f7196862222b45cfb9d6eda.tar.bz2 |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2:
ocfs2: Avoid a gcc warning in ocfs2_wipe_inode().
ocfs2: Avoid direct write if we fall back to buffered I/O
ocfs2_dlmfs: Fix math error when reading LVB.
ocfs2: Update VFS inode's id info after reflink.
ocfs2: potential ERR_PTR dereference on error paths
ocfs2: Add directory entry later in ocfs2_symlink() and ocfs2_mknod()
ocfs2: use OCFS2_INODE_SKIP_ORPHAN_DIR in ocfs2_mknod error path
ocfs2: use OCFS2_INODE_SKIP_ORPHAN_DIR in ocfs2_symlink error path
ocfs2: add OCFS2_INODE_SKIP_ORPHAN_DIR flag and honor it in the inode wipe code
ocfs2: Reset status if we want to restart file extension.
ocfs2: Compute metaecc for superblocks during online resize.
ocfs2: Check the owner of a lockres inside the spinlock
ocfs2: one more warning fix in ocfs2_file_aio_write(), v2
ocfs2_dlmfs: User DLM_* when decoding file open flags.
Diffstat (limited to 'arch/powerpc/sysdev/cpm1.c')
0 files changed, 0 insertions, 0 deletions