Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

X

xcap-capability-linux
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Incidents
- Service Desk

Snippets Groups Projects

d6c0cb37

Commit d6c0cb37 authored 13 years ago by Chris Mason

Downloads
- Plain Diff

Merge branch 'cleanups_and_fixes' into inode_numbers


Conflicts:
	fs/btrfs/tree-log.c
	fs/btrfs/volumes.c

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

parents 8e531cdf 1f78160c

Branches

Tags

No related merge requests found

Changes 16

Hide whitespace changes

Inline Side-by-side

Showing

fs/btrfs/ctree.c 2 additions, 6 deletions

fs/btrfs/ctree.c
fs/btrfs/ctree.h 0 additions, 3 deletions

fs/btrfs/ctree.h
fs/btrfs/dir-item.c 1 addition, 2 deletions

fs/btrfs/dir-item.c
fs/btrfs/disk-io.c 7 additions, 6 deletions

fs/btrfs/disk-io.c
fs/btrfs/extent-tree.c 4 additions, 3 deletions

fs/btrfs/extent-tree.c
fs/btrfs/extent_io.c 40 additions, 16 deletions

fs/btrfs/extent_io.c
fs/btrfs/file-item.c 6 additions, 7 deletions

fs/btrfs/file-item.c
fs/btrfs/inode-item.c 0 additions, 2 deletions

fs/btrfs/inode-item.c
fs/btrfs/inode.c 3 additions, 3 deletions

fs/btrfs/inode.c
fs/btrfs/ioctl.c 5 additions, 6 deletions

fs/btrfs/ioctl.c
fs/btrfs/root-tree.c 5 additions, 1 deletion

fs/btrfs/root-tree.c
fs/btrfs/super.c 3 additions, 1 deletion

fs/btrfs/super.c
fs/btrfs/tree-log.c 26 additions, 10 deletions

fs/btrfs/tree-log.c
fs/btrfs/version.sh 0 additions, 43 deletions

fs/btrfs/version.sh
fs/btrfs/volumes.c 83 additions, 36 deletions

fs/btrfs/volumes.c
fs/btrfs/volumes.h 2 additions, 0 deletions

fs/btrfs/volumes.h

with 187 additions and 145 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