aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ocfs2
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/o...Linus Torvalds2010-08-136-93/+122
|\
| * O2net: Disallow o2net accept connection request from itself.Tristan Ye2010-08-071-5/+12
| * ocfs2/dlm: remove potential deadlock -V3Wengang Wang2010-08-071-4/+0
| * ocfs2/dlm: avoid incorrect bit set in refmap on recovery masterWengang Wang2010-08-072-25/+31
| * Fix the nested PR lock calling issue in ACLJiaju Zhang2010-08-071-3/+21
| * ocfs2: Count more refcount records in file system fragmentation.Tao Ma2010-08-071-5/+15
| * ocfs2 fix o2dlm dlm run purgelist (rev 3)Srinivas Eeda2010-08-071-46/+34
| * ocfs2/dlm: fix a dead lockWengang Wang2010-08-071-3/+2
| * ocfs2: do not overwrite error codes in ocfs2_init_aclTiger Yang2010-08-071-2/+7
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2010-08-106-34/+49
|\ \
| * | convert remaining ->clear_inode() to ->evict_inode()Al Viro2010-08-091-4/+3
| * | Make ->drop_inode() just return whether inode needs to be droppedAl Viro2010-08-092-4/+6
| * | convert ocfs2 to ->evict_inode()Al Viro2010-08-093-11/+16
| * | check ATTR_SIZE contraints in inode_change_okChristoph Hellwig2010-08-091-3/+3
| * | remove inode_setattrChristoph Hellwig2010-08-092-7/+17
| * | sort out blockdev_direct_IO variantsChristoph Hellwig2010-08-091-5/+4
* | | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4Linus Torvalds2010-08-071-2/+2
|\ \ \
| * | | jbd2: Change j_state_lock to be a rwlock_tTheodore Ts'o2010-08-031-2/+2
| * | | direct-io: move aio_complete into ->end_ioChristoph Hellwig2010-07-271-1/+6
* | | | Merge branch 'master' into for-nextJiri Kosina2010-08-0414-210/+491
|\ \ \ \ | | |/ / | |/| |
| * | | direct-io: move aio_complete into ->end_ioChristoph Hellwig2010-07-261-1/+6
| | |/ | |/|
| * | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2010-07-1813-208/+485
| |\ \
| | * | ocfs2: Silence gcc warning in ocfs2_write_zero_page().Joel Becker2010-07-161-1/+1
| | * | jbd2/ocfs2: Fix block checksumming when a buffer is used in several transactionsJan Kara2010-07-151-12/+12
| | * | ocfs2/dlm: Remove BUG_ON from migration in the rare case of a down nodeWengang Wang2010-07-151-8/+14
| | * | ocfs2: Don't duplicate pages past i_size during CoW.Tao Ma2010-07-151-0/+6
| | * | ocfs2: tighten up strlen() checkingDan Carpenter2010-07-121-1/+1
| | * | ocfs2: Make xattr reflink work with new local alloc reservation.Tao Ma2010-07-121-36/+90
| | * | ocfs2: make xattr extension work with new local alloc reservation.Tao Ma2010-07-121-29/+45
| | * | ocfs2: Remove the redundant cpu_to_le64.Tao Ma2010-07-121-1/+1
| | * | ocfs2/dlm: don't access beyond bitmap sizeWengang Wang2010-07-121-1/+1
| | * | ocfs2: No need to zero pages past i_size.Joel Becker2010-07-121-4/+18
| | * | ocfs2: Zero the tail cluster when extending past i_size.Joel Becker2010-07-086-54/+207
| | * | ocfs2: When zero extending, do it by page.Joel Becker2010-07-082-64/+84
| | * | ocfs2: Limit default local alloc size within bitmap range.Tao Ma2010-06-151-0/+7
| | * | ocfs2: Move orphan scan work to ocfs2_wq.Tao Ma2010-06-151-3/+3
| | * | fs/ocfs2/dlm: Add missing spin_unlockJulia Lawall2010-06-151-0/+1
| | |/
| * | ocfs2: update gfp/slab.h includesTejun Heo2010-06-281-1/+0
| |/
* | fs/ocfs2: Remove unnecessary casts of private_dataJoe Perches2010-07-203-7/+6
* | Merge branch 'master' into for-nextJiri Kosina2010-06-167-57/+49
|\ \ | |/
| * Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jac...Linus Torvalds2010-05-301-27/+23
| |\
| | * quota: rename default quotactl methods to dquot_Christoph Hellwig2010-05-241-9/+9
| | * quota: drop remount argument to ->quota_on and ->quota_offChristoph Hellwig2010-05-241-8/+2
| | * quota: kill the vfs_dq_off and vfs_dq_quota_on_remount wrappersChristoph Hellwig2010-05-241-9/+5
| | * ocfs2: Fix use after free on remount read-onlyJan Kara2010-05-241-1/+7
| * | kill spurious reference to vmtruncatenpiggin@suse.de2010-05-271-2/+6
| * | drop unused dentry argument to ->fsyncChristoph Hellwig2010-05-271-4/+3
| * | kernel-wide: replace USHORT_MAX, SHORT_MAX and SHORT_MIN with USHRT_MAX, SHRT...Alexey Dobriyan2010-05-251-2/+2
| |/
| * ocfs2: replace inode uid,gid,mode initialization with helper functionDmitry Monakhov2010-05-211-8/+1
| * ocfs: constify xattr_handlerStephen Hemminger2010-05-213-14/+14