summaryrefslogtreecommitdiffstats
path: root/fs/ocfs2
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2016-07-281-1/+1
|\
| * Merge branch 'd_real' of git://git.kernel.org/pub/scm/linux/kernel/git/mszere...Al Viro2016-06-302-2/+5
| |\
| * | file_inode(f)->i_mapping is f->f_mappingAl Viro2016-05-291-1/+1
* | | Merge branch 'salted-string-hash'Linus Torvalds2016-07-281-1/+1
|\ \ \
| * | | vfs: make the string hashes salt the hashLinus Torvalds2016-06-101-1/+1
| |/ /
* | | Merge branch 'akpm' (patches from Andrew)Linus Torvalds2016-07-268-73/+26
|\ \ \
| * | | ocfs2/cluster: clean up unnecessary assignment for 'ret'piaojun2016-07-261-6/+2
| * | | ocfs2: remove obscure BUG_ON in dlmglueJoseph Qi2016-07-261-9/+0
| * | | ocfs2: cleanup implemented prototypesJoseph Qi2016-07-262-8/+0
| * | | ocfs2/dlm: fix memory leak of dlm_debug_ctxtJoseph Qi2016-07-262-25/+2
| * | | ocfs2: cleanup unneeded goto in ocfs2_create_new_inode_locksJoseph Qi2016-07-261-3/+1
| * | | ocfs2: improve recovery performanceJunxiao Bi2016-07-261-20/+21
| * | | ocfs2: fix a redundant re-initializationEric Ren2016-07-261-2/+0
| | |/ | |/|
* | | Merge branch 'for-4.8/core' of git://git.kernel.dk/linux-blockLinus Torvalds2016-07-264-11/+15
|\ \ \ | |/ / |/| |
| * | ocfs2: use bio op accessorsMike Christie2016-06-071-4/+6
| * | fs: have ll_rw_block users pass in op and flags separatelyMike Christie2016-06-072-2/+2
| * | fs: have submit_bh users pass in op and flags separatelyMike Christie2016-06-071-4/+4
| * | block/fs/drivers: remove rw argument from submit_bioMike Christie2016-06-071-5/+7
| |/
* / ocfs2: disable BUG assertions in reading blocksGang He2016-06-242-2/+5
|/
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2016-05-271-10/+13
|\
| * switch xattr_handler->set() to passing dentry and inode separatelyAl Viro2016-05-271-10/+13
* | ocfs2: bump up o2cb network protocol versionJunxiao Bi2016-05-271-1/+4
* | ocfs2: o2hb: fix hb hung timeJunxiao Bi2016-05-271-1/+1
* | ocfs2: o2hb: don't negotiate if last hb failJunxiao Bi2016-05-271-0/+10
* | ocfs2: o2hb: add some user/debug logJunxiao Bi2016-05-271-7/+32
* | ocfs2: o2hb: add NEGOTIATE_APPROVE messageJunxiao Bi2016-05-271-1/+27
* | ocfs2: o2hb: add NEGO_TIMEOUT messageJunxiao Bi2016-05-271-1/+65
* | ocfs2: o2hb: add negotiate timerJunxiao Bi2016-05-271-4/+47
* | ocfs2: fix improper handling of return errnoEric Ren2016-05-261-6/+1
|/
* Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/t...Linus Torvalds2016-05-241-1/+1
|\
| * jbd2: add support for avoiding data writes during transaction commitsJan Kara2016-04-241-1/+1
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2016-05-201-8/+9
|\ \
| * | ocfs2/cluster: block BH in TCP callbacksEric Dumazet2016-05-191-8/+9
* | | ocfs2: clean up an unneeded goto in ocfs2_put_slot()Guozhonghua2016-05-191-5/+1
* | | ocfs2: clean up unused parameter 'count' in o2hb_read_block_input()Jun Piao2016-05-191-3/+2
* | | ocfs2: clean up an unused variable 'wants_rotate' in ocfs2_truncate_recpiaojun2016-05-191-2/+1
* | | ocfs2: fix comment in struct ocfs2_extended_slotGuozhonghua2016-05-191-1/+1
|/ /
* | Merge branch 'work.preadv2' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2016-05-171-5/+4
|\ \
| * | direct-io: eliminate the offset argument to ->direct_IOChristoph Hellwig2016-05-011-5/+4
| |/
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2016-05-175-14/+17
|\ \
| * \ Merge branch 'ovl-fixes' into for-linusAl Viro2016-05-171-0/+2
| |\ \
| * | | parallel lookups: actual switch to rwsemAl Viro2016-05-021-1/+1
| * | | ocfs2: don't open-code inode_lock/inode_unlockAl Viro2016-05-021-2/+2
| * | | Merge getxattr prototype change into work.lookupsAl Viro2016-05-023-11/+14
| |\ \ \ | | |_|/ | |/| |
| | * | xattr_handler: pass dentry and inode as separate arguments of ->get()Al Viro2016-04-101-10/+10
| | * | don't bother with ->d_inode->i_sb - it's always equal to ->d_sbAl Viro2016-04-101-1/+1
| | * | posix_acl: Inode acl caching fixesAndreas Gruenbacher2016-03-311-0/+3
* | | | ocfs2: fix posix_acl_create deadlockJunxiao Bi2016-05-126-48/+77
* | | | ocfs2: revert using ocfs2_acl_chmod to avoid inode cluster lock hangJunxiao Bi2016-05-123-2/+27
| |_|/ |/| |
* | | ocfs2/dlm: return zero if deref_done message is successfully handledxuejiufei2016-04-281-0/+2
|/ /