diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-06 17:15:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-06 17:15:15 -0700 |
| commit | 1cc9629402b1eba0d4e21b2cc43eec9bd737f9bd (patch) | |
| tree | 6bd52203d0d071acd3311d5093b4aa61c313faad /fs/ceph/debugfs.c | |
| parent | 8b8ce8810b092cef35e15af6577ad569f6145c0a (diff) | |
| parent | 153a10939ea6e42e9c0115b0645060d0d7bb4697 (diff) | |
| download | kernel_samsung_crespo-1cc9629402b1eba0d4e21b2cc43eec9bd737f9bd.zip kernel_samsung_crespo-1cc9629402b1eba0d4e21b2cc43eec9bd737f9bd.tar.gz kernel_samsung_crespo-1cc9629402b1eba0d4e21b2cc43eec9bd737f9bd.tar.bz2 | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
ceph: fix crush device 'out' threshold to 1.0, not 0.1
ceph: fix caps usage accounting for import (non-reserved) case
ceph: only release clean, unused caps with mds requests
ceph: fix crush CHOOSE_LEAF when type is already a leaf
ceph: fix crush recursion
ceph: fix caps debugfs entry
ceph: delay umount until all mds requests drop inode+dentry refs
ceph: handle splice_dentry/d_materialize_unique error in readdir_prepopulate
ceph: fix crush map update decoding
ceph: fix message memory leak, uninitialized variable
ceph: fix map handler error path
ceph: some endianity fixes
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 3be33fb..f2f5332 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); |