summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorAlex Elder <elder@inktank.com>2012-11-13 21:11:15 -0600
committerAlex Elder <elder@inktank.com>2013-01-17 15:52:05 -0600
commit4d6b250bf18d44571d69a0f4afec4b6a1969729f (patch)
tree8f357c6f3a8871ff678cb6a9e024d1282f8c5dfb /include
parente8afad656cbcd06d02a7bacd4b318fa0e2907de0 (diff)
downloadlinux-stable-4d6b250bf18d44571d69a0f4afec4b6a1969729f.tar.gz
linux-stable-4d6b250bf18d44571d69a0f4afec4b6a1969729f.tar.bz2
linux-stable-4d6b250bf18d44571d69a0f4afec4b6a1969729f.zip
libceph: drop snapid in ceph_calc_raw_layout()
A snapshot id must be provided to ceph_calc_raw_layout() even though it is not needed at all for calculating the layout. Where the snapshot id *is* needed is when building the request message for an osd operation. Drop the snapid parameter from ceph_calc_raw_layout() and pass that value instead in ceph_osdc_build_request(). Signed-off-by: Alex Elder <elder@inktank.com> Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/ceph/osd_client.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/ceph/osd_client.h b/include/linux/ceph/osd_client.h
index 4bfb4582439a..0e82a0a967ef 100644
--- a/include/linux/ceph/osd_client.h
+++ b/include/linux/ceph/osd_client.h
@@ -209,7 +209,6 @@ extern void ceph_osdc_handle_map(struct ceph_osd_client *osdc,
extern int ceph_calc_raw_layout(struct ceph_osd_client *osdc,
struct ceph_file_layout *layout,
- u64 snapid,
u64 off, u64 *plen, u64 *bno,
struct ceph_osd_request *req,
struct ceph_osd_req_op *op);
@@ -227,6 +226,7 @@ extern void ceph_osdc_build_request(struct ceph_osd_request *req,
u64 off, u64 len,
struct ceph_osd_req_op *src_ops,
struct ceph_snap_context *snapc,
+ u64 snap_id,
struct timespec *mtime);
extern struct ceph_osd_request *ceph_osdc_new_request(struct ceph_osd_client *,