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

80914d97

Commit 80914d97 authored 18 years ago by Greg Kroah-Hartman

Downloads
- Plain Diff

Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2

parents 74361cb6 883d4cae

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/dlmmaster.c 0 additions, 1 deletion

fs/ocfs2/dlm/dlmmaster.c
fs/ocfs2/dlm/dlmunlock.c 18 additions, 25 deletions

fs/ocfs2/dlm/dlmunlock.c
fs/ocfs2/localalloc.c 8 additions, 0 deletions

fs/ocfs2/localalloc.c
fs/ocfs2/ocfs2.h 1 addition, 1 deletion

fs/ocfs2/ocfs2.h
fs/ocfs2/suballoc.c 228 additions, 33 deletions

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

fs/ocfs2/suballoc.h
fs/ocfs2/super.c 6 additions, 2 deletions

fs/ocfs2/super.c

with 263 additions and 62 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