Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

R

R128
- Activity
- Members
- Labels
- Terraform modules
- Incidents

Snippets Groups Projects

c126dea7

Commit c126dea7 authored 13 years ago by Chris Mason

Downloads
- Plain Diff

Merge branch 'integrity-check-patch-v2' of git://btrfs.giantdisaster.de/git/btrfs into integration


Conflicts:
	fs/btrfs/ctree.h
	fs/btrfs/super.c

Signed-off-by: Chris Mason <chris.mason@oracle.com>

parents 9785dbdf 21adbd5c

No related branches found

No related tags found

Loading

Changes 10

Expand all Hide whitespace changes

Inline Side-by-side

Showing

fs/btrfs/Kconfig 19 additions, 0 deletions

fs/btrfs/Kconfig
fs/btrfs/Makefile 1 addition, 0 deletions

fs/btrfs/Makefile
fs/btrfs/check-integrity.c 3068 additions, 0 deletions

fs/btrfs/check-integrity.c
fs/btrfs/check-integrity.h 36 additions, 0 deletions

fs/btrfs/check-integrity.h
fs/btrfs/ctree.h 7 additions, 1 deletion

fs/btrfs/ctree.h
fs/btrfs/disk-io.c 24 additions, 2 deletions

fs/btrfs/disk-io.c
fs/btrfs/extent_io.c 3 additions, 2 deletions

fs/btrfs/extent_io.c
fs/btrfs/scrub.c 3 additions, 2 deletions

fs/btrfs/scrub.c
fs/btrfs/super.c 36 additions, 0 deletions

fs/btrfs/super.c
fs/btrfs/volumes.c 4 additions, 3 deletions

fs/btrfs/volumes.c

with 3201 additions and 10 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