projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branches 'asoc/fix/topology', 'asoc/fix/adau17x1', 'asoc/fix...
[linux-2.6-block.git]
/
net
/
ceph
/
mon_client.c
diff --git
a/net/ceph/mon_client.c
b/net/ceph/mon_client.c
index 875675765531361fffa503707a9a98e4596664dd..63edc6e5f0269f21275d6b7be5673e41ba5a9177 100644
(file)
--- a/
net/ceph/mon_client.c
+++ b/
net/ceph/mon_client.c
@@
-676,7
+676,8
@@
bad:
/*
* Do a synchronous statfs().
*/
/*
* Do a synchronous statfs().
*/
-int ceph_monc_do_statfs(struct ceph_mon_client *monc, struct ceph_statfs *buf)
+int ceph_monc_do_statfs(struct ceph_mon_client *monc, u64 data_pool,
+ struct ceph_statfs *buf)
{
struct ceph_mon_generic_request *req;
struct ceph_mon_statfs *h;
{
struct ceph_mon_generic_request *req;
struct ceph_mon_statfs *h;
@@
-696,6
+697,7
@@
int ceph_monc_do_statfs(struct ceph_mon_client *monc, struct ceph_statfs *buf)
goto out;
req->u.st = buf;
goto out;
req->u.st = buf;
+ req->request->hdr.version = cpu_to_le16(2);
mutex_lock(&monc->mutex);
register_generic_request(req);
mutex_lock(&monc->mutex);
register_generic_request(req);
@@
-705,6
+707,8
@@
int ceph_monc_do_statfs(struct ceph_mon_client *monc, struct ceph_statfs *buf)
h->monhdr.session_mon = cpu_to_le16(-1);
h->monhdr.session_mon_tid = 0;
h->fsid = monc->monmap->fsid;
h->monhdr.session_mon = cpu_to_le16(-1);
h->monhdr.session_mon_tid = 0;
h->fsid = monc->monmap->fsid;
+ h->contains_data_pool = (data_pool != CEPH_NOPOOL);
+ h->data_pool = cpu_to_le64(data_pool);
send_generic_request(monc, req);
mutex_unlock(&monc->mutex);
send_generic_request(monc, req);
mutex_unlock(&monc->mutex);