Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

K

KED Linux Kernel Fork
- Activity
- Members
- Labels
- Model registry
- Model experiments

Snippets Groups Projects

ab479995

Commit ab479995 authored 19 years ago by Linus Torvalds

Downloads
- Plain Diff

Merge branch 'upstream-linus' of git://oss.oracle.com/home/sourcebo/git/ocfs2

parents 26d451b6 f671c09b

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

fs/ocfs2/dlm/dlmcommon.h 4 additions, 0 deletions

fs/ocfs2/dlm/dlmcommon.h
fs/ocfs2/dlm/dlmconvert.c 9 additions, 3 deletions

fs/ocfs2/dlm/dlmconvert.c
fs/ocfs2/dlm/dlmlock.c 24 additions, 1 deletion

fs/ocfs2/dlm/dlmlock.c
fs/ocfs2/dlm/dlmmaster.c 6 additions, 1 deletion

fs/ocfs2/dlm/dlmmaster.c
fs/ocfs2/dlm/dlmrecovery.c 42 additions, 0 deletions

fs/ocfs2/dlm/dlmrecovery.c
fs/ocfs2/journal.c 3 additions, 4 deletions

fs/ocfs2/journal.c
fs/ocfs2/journal.h 0 additions, 2 deletions

fs/ocfs2/journal.h

with 88 additions and 11 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment