diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2010-07-24 17:49:13 +0200 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-07-24 17:49:13 +0200 |
| commit | 4e4f62bf7396fca48efe61513640ee399a6046e3 (patch) | |
| tree | 42a503af02d9806bcc05e5fcc2cd53f9bd45b0c2 /fs/ceph/debugfs.c | |
| parent | of/device: Fix build errors for non-ppc and non-microblaze (diff) | |
| parent | Linux 2.6.35-rc6 (diff) | |
| download | linux-4e4f62bf7396fca48efe61513640ee399a6046e3.tar.xz linux-4e4f62bf7396fca48efe61513640ee399a6046e3.zip | |
Merge commit 'v2.6.35-rc6' into devicetree/next
Conflicts:
arch/sparc/kernel/prom_64.c
Diffstat (limited to 'fs/ceph/debugfs.c')
| -rw-r--r-- | fs/ceph/debugfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ceph/debugfs.c b/fs/ceph/debugfs.c index 3be33fb066cc..f2f5332ddbba 100644 --- a/fs/ceph/debugfs.c +++ b/fs/ceph/debugfs.c @@ -261,7 +261,7 @@ static int osdc_show(struct seq_file *s, void *pp) static int caps_show(struct seq_file *s, void *p) { - struct ceph_client *client = p; + struct ceph_client *client = s->private; int total, avail, used, reserved, min; ceph_reservation_status(client, &total, &avail, &used, &reserved, &min); |