aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ocfs2/dlm
Commit message (Expand)AuthorAgeFilesLines
* Fix common misspellingsLucas De Marchi2011-03-311-2/+2
* Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2011-03-286-42/+29
|\
| * Merge branch 'mlog_replace_for_39' of git://repo.or.cz/taoma-kernel into ocfs...Joel Becker2011-03-286-30/+13
| |\
| | * ocfs2: Remove EXIT from masklog.Tao Ma2011-03-071-4/+1
| | * ocfs2: Remove ENTRY from masklog.Tao Ma2011-02-216-26/+12
| * | ocfs2/dlm: Move kmalloc() outside the spinlockSunil Mushran2011-02-221-12/+16
| |/
* | fs: change to new flag variablematt mooney2011-03-171-1/+1
|/
* Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2011-01-117-268/+244
|\
| * ocfs2/dlm: Hard code the values for enumsSunil Mushran2010-12-221-43/+43
| * ocfs2/dlm: Minor cleanupSunil Mushran2010-12-221-14/+8
| * ocfs2/dlm: Cleanup dlmdebug.cSunil Mushran2010-12-222-117/+66
| * ocfs2/cluster: Pin/unpin o2hb regionsSunil Mushran2010-12-161-4/+4
| * ocfs2/dlm: make existing convertion precedent over new lockWengang Wang2010-12-161-0/+3
| * ocfs2/dlm: Cleanup mlogs in dlmthread.c, dlmast.c and dlmdomain.cSunil Mushran2010-12-163-90/+120
* | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2010-12-231-13/+27
|\ \ | |/ |/|
| * ocfs2/dlm: Migrate lockres with no locks if it has a referenceSunil Mushran2010-12-091-13/+27
* | fs/ocfs2/dlm: Use GFP_ATOMIC under spin_lockDavid Sterba2010-11-181-1/+1
|/
* Merge branch 'globalheartbeat-2' of git://oss.oracle.com/git/smushran/linux-2...Joel Becker2010-10-154-4/+480
|\
| * ocfs2/cluster: Bump up dlm protocol to version 1.1Sunil Mushran2010-10-091-1/+1
| * ocfs2/dlm: Add message DLM_QUERY_NODEINFOSunil Mushran2010-10-072-1/+198
| * ocfs2/dlm: Add message DLM_QUERY_REGIONSunil Mushran2010-10-092-1/+229
| * ocfs2/dlm: Expose dlm_protocol in dlm_stateSunil Mushran2010-10-061-1/+3
| * o2dlm: force free mles during dlm exitSrinivas Eeda2010-09-233-0/+42
| * Ocfs2: Handle empty list in lockres_seq_start() for dlmdebug.cTristan Ye2010-09-101-1/+8
* | ocfs2: Initialize the bktcnt variable properly, and call it bucket_countJoel Becker2010-09-151-4/+4
|/
* Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/o...Linus Torvalds2010-08-133-78/+67
|\
| * 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
| * 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
* | Merge branch 'master' into for-nextJiri Kosina2010-08-043-10/+17
|\ \ | |/
| * ocfs2/dlm: Remove BUG_ON from migration in the rare case of a down nodeWengang Wang2010-07-151-8/+14
| * ocfs2: tighten up strlen() checkingDan Carpenter2010-07-121-1/+1
| * ocfs2/dlm: don't access beyond bitmap sizeWengang Wang2010-07-121-1/+1
| * fs/ocfs2/dlm: Add missing spin_unlockJulia Lawall2010-06-151-0/+1
* | fs/ocfs2: Remove unnecessary casts of private_dataJoe Perches2010-07-201-3/+3
|/
* Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2010-05-219-49/+77
|\
| * ocfs2:dlm: avoid dlm->ast_lock lockres->spinlock dependency breakWengang Wang2010-05-183-8/+14
| * fs/ocfs2/dlm: Use kstrdupJulia Lawall2010-05-181-2/+1
| * fs/ocfs2/dlm: Drop memory allocation castJulia Lawall2010-05-182-13/+7
| * ocfs2/dlm: Increase o2dlm lockres hash sizeSunil Mushran2010-05-051-1/+1
| * ocfs2/dlm: Make o2dlm domain join/leave messages KERN_NOTICESunil Mushran2010-05-051-3/+3
| * ocfs2: print node # when tcp failsWengang Wang2010-05-057-22/+51
* | Merge branch 'skip_delete_inode' of git://git.kernel.org/pub/scm/linux/kernel...Joel Becker2010-04-304-4/+0
|\ \
| * | include cleanup: Update gfp.h and slab.h includes to prepare for breaking imp...Tejun Heo2010-03-304-4/+0
* | | ocfs2: Check the owner of a lockres inside the spinlockWengang Wang2010-03-301-3/+2
|/ /
* | ocfs2: Fix a race in o2dlm lockres masterySrinivas Eeda2010-03-231-3/+1
|/
* dlm: allow dlm do recovery during shutdownSrinivas Eeda2010-02-261-1/+1
* ocfs2_dlmfs: Move to its own directoryJoel Becker2010-02-266-1574/+1
* ocfs2_dlmfs: Use poll() to signify BASTs.Joel Becker2010-02-261-1/+23