linux-stable.git/drivers/block/rbd.c, branch v3.5

rbd: endian bug in rbd_req_cb()

2012-07-18T04:30:31+00:00

Sparse complains about this because:
drivers/block/rbd.c:996:20: warning: cast to restricted __le32
drivers/block/rbd.c:996:20: warning: cast from restricted __le16

These are set in osd_req_encode_op() and they are le16.

Signed-off-by: Dan Carpenter 
Reviewed-by: Alex Elder 
(cherry picked from commit 895cfcc810e53d7d36639969c71efb9087221167)

rbd: Fix ceph_snap_context size calculation

2012-07-18T04:30:19+00:00

ceph_snap_context->snaps is an u64 array

Signed-off-by: Zheng Yan 
Reviewed-by: Alex Elder 
(cherry picked from commit f9f9a1904467816452fc70740165030e84c2c659)

rbd: rename __rbd_update_snaps to __rbd_refresh_header

2012-05-14T17:13:09+00:00

This function rereads the entire header and handles any changes in
it, not just changes in snapshots.

Signed-off-by: Josh Durgin 
Reviewed-by: Alex Elder 
Reviewed-by: Yehuda Sadeh

rbd: fix snapshot size type

2012-05-14T17:13:03+00:00

Snapshot sizes should be the same type as regular image sizes. This
only affects their displayed size in sysfs, not the reported size of
an actual block device sizes.

Signed-off-by: Josh Durgin 
Reviewed-by: Alex Elder 
Reviewed-by: Yehuda Sadeh

rbd: remove conditional snapid parameters

2012-05-14T17:12:58+00:00

The snapid parameters passed to rbd_do_op() and rbd_req_sync_op()
are now always either a valid snapid or an explicit CEPH_NOSNAP.

[elder@dreamhost.com: Rephrased the description]

Signed-off-by: Josh Durgin 
Reviewed-by: Alex Elder 
Reviewed-by: Yehuda Sadeh

rbd: store snapshot id instead of index

2012-05-14T17:12:52+00:00

When a device was open at a snapshot, and snapshots were deleted or
added, data from the wrong snapshot could be read. Instead of
assuming the snap context is constant, store the actual snap id when
the device is initialized, and rely on the OSDs to signal an error
if we try reading from a snapshot that was deleted.

Signed-off-by: Josh Durgin 
Reviewed-by: Alex Elder 
Reviewed-by: Yehuda Sadeh

rbd: protect read of snapshot sequence number

2012-05-14T17:12:46+00:00

This is updated whenever a snapshot is added or deleted, and the
snapc pointer is changed with every refresh of the header.

Signed-off-by: Josh Durgin 
Reviewed-by: Alex Elder 
Reviewed-by: Yehuda Sadeh

rbd: fix integer overflow in rbd_header_from_disk()

2012-05-14T17:12:41+00:00

ondisk->snap_count is read from disk via rbd_req_sync_read() and thus
needs validation.  Otherwise, a bogus `snap_count' could overflow the
kmalloc() size, leading to memory corruption.

Also use `u32' consistently for `snap_count'.

[elder@dreamhost.com: changed to use UINT_MAX rather than ULONG_MAX]

Signed-off-by: Xi Wang 
Reviewed-by: Alex Elder

rbd: use gfp_flags parameter in rbd_header_from_disk()

2012-05-14T17:12:35+00:00

We should use the gfp_flags that the caller specified instead of
GFP_KERNEL here.

There is only one caller and it uses GFP_KERNEL, so this change is
just a cleanup and doesn't change how the code works.

Signed-off-by: Dan Carpenter 
Reviewed-by: Alex Elder

ceph: drop support for preferred_osd pgs

2012-05-07T22:33:36+00:00

This was an ill-conceived feature that has been removed from Ceph.  Do
this gracefully:

 - reject attempts to specify a preferred_osd via the ioctl
 - stop exposing this information via virtual xattrs
 - always fill in -1 for requests, in case we talk to an older server
 - don't calculate preferred_osd placements/pgids

Reviewed-by: Alex Elder 
Signed-off-by: Sage Weil