diff options
| author | Linus Torvalds | 2010-04-15 03:45:31 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2010-04-15 03:45:31 +0200 |
| commit | 96e35b40c0d6206f56370f937f6f4722739eb273 (patch) | |
| tree | 2c387b6e3f628484a1f4bdc964e529f89d5f5821 /fs/ceph/osdmap.h | |
| parent | Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
| parent | ceph: use separate class for ceph sockets' sk_lock (diff) | |
| download | kernel-qcow2-linux-96e35b40c0d6206f56370f937f6f4722739eb273.tar.gz kernel-qcow2-linux-96e35b40c0d6206f56370f937f6f4722739eb273.tar.xz kernel-qcow2-linux-96e35b40c0d6206f56370f937f6f4722739eb273.zip | |
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: use separate class for ceph sockets' sk_lock
ceph: reserve one more caps space when doing readdir
ceph: queue_cap_snap should always queue dirty context
ceph: fix dentry reference leak in dcache readdir
ceph: decode v5 of osdmap (pool names) [protocol change]
ceph: fix ack counter reset on connection reset
ceph: fix leaked inode ref due to snap metadata writeback race
ceph: fix snap context reference leaks
ceph: allow writeback of snapped pages older than 'oldest' snapc
ceph: fix dentry rehashing on virtual .snap dir
Diffstat (limited to 'fs/ceph/osdmap.h')
| -rw-r--r-- | fs/ceph/osdmap.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/ceph/osdmap.h b/fs/ceph/osdmap.h index 1fb55afb2642..8bc9f1e4f562 100644 --- a/fs/ceph/osdmap.h +++ b/fs/ceph/osdmap.h @@ -23,6 +23,7 @@ struct ceph_pg_pool_info { int id; struct ceph_pg_pool v; int pg_num_mask, pgp_num_mask, lpg_num_mask, lpgp_num_mask; + char *name; }; struct ceph_pg_mapping { |