Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

AndroidKernelMSM
- Activity
- Members

Snippets Groups Projects

969e5aa3

Commit 969e5aa3 authored Jan 30, 2013 by Alex Elder

Downloads
- Plain Diff

Merge branch 'testing' of github.com:ceph/ceph-client into v3.8-rc5-testing

parents 949db153 1ec3911d

No related branches found

No related tags found

No related merge requests found

Changes 14

Show whitespace changes

Inline Side-by-side

Showing

drivers/block/rbd.c 444 additions, 411 deletions

drivers/block/rbd.c
fs/ceph/caps.c 25 additions, 7 deletions

fs/ceph/caps.c
fs/ceph/file.c 6 additions, 0 deletions

fs/ceph/file.c
fs/ceph/ioctl.c 1 addition, 1 deletion

fs/ceph/ioctl.c
fs/ceph/mds_client.c 31 additions, 2 deletions

fs/ceph/mds_client.c
fs/ceph/mds_client.h 6 additions, 0 deletions

fs/ceph/mds_client.h
include/linux/ceph/ceph_features.h 7 additions, 1 deletion

include/linux/ceph/ceph_features.h
include/linux/ceph/decode.h 17 additions, 12 deletions

include/linux/ceph/decode.h
include/linux/ceph/osd_client.h 9 additions, 15 deletions

include/linux/ceph/osd_client.h
include/linux/ceph/osdmap.h 1 addition, 1 deletion

include/linux/ceph/osdmap.h
include/linux/crush/crush.h 2 additions, 0 deletions

include/linux/crush/crush.h
net/ceph/crush/mapper.c 11 additions, 4 deletions

net/ceph/crush/mapper.c
net/ceph/osd_client.c 72 additions, 134 deletions

net/ceph/osd_client.c
net/ceph/osdmap.c 20 additions, 23 deletions

net/ceph/osdmap.c

with 652 additions and 611 deletions

Loading

0% Loading or .

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

Finish editing this message first!

Please sign in to comment