projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...
[GitHub/mt8127/android_kernel_alcatel_ttab.git]
/
drivers
/
block
/
rbd.c
diff --git
a/drivers/block/rbd.c
b/drivers/block/rbd.c
index 7c66173e2d83c84b2f7909c4dea703d38ee8297f..aff789d6fccd35b7f0a0c3314e5c04951c6c774c 100644
(file)
--- a/
drivers/block/rbd.c
+++ b/
drivers/block/rbd.c
@@
-497,7
+497,7
@@
static int rbd_open(struct block_device *bdev, fmode_t mode)
return 0;
}
return 0;
}
-static
int
rbd_release(struct gendisk *disk, fmode_t mode)
+static
void
rbd_release(struct gendisk *disk, fmode_t mode)
{
struct rbd_device *rbd_dev = disk->private_data;
unsigned long open_count_before;
{
struct rbd_device *rbd_dev = disk->private_data;
unsigned long open_count_before;
@@
-510,8
+510,6
@@
static int rbd_release(struct gendisk *disk, fmode_t mode)
mutex_lock_nested(&ctl_mutex, SINGLE_DEPTH_NESTING);
put_device(&rbd_dev->dev);
mutex_unlock(&ctl_mutex);
mutex_lock_nested(&ctl_mutex, SINGLE_DEPTH_NESTING);
put_device(&rbd_dev->dev);
mutex_unlock(&ctl_mutex);
-
- return 0;
}
static const struct block_device_operations rbd_bd_ops = {
}
static const struct block_device_operations rbd_bd_ops = {
@@
-1200,7
+1198,7
@@
static struct bio *bio_clone_range(struct bio *bio_src,
/* Find first affected segment... */
resid = offset;
/* Find first affected segment... */
resid = offset;
-
__bio_for_each_segment(bv, bio_src, idx, 0
) {
+
bio_for_each_segment(bv, bio_src, idx
) {
if (resid < bv->bv_len)
break;
resid -= bv->bv_len;
if (resid < bv->bv_len)
break;
resid -= bv->bv_len;
@@
-2254,13
+2252,17
@@
static int rbd_img_request_fill(struct rbd_img_request *img_request,
obj_request->pages, length,
offset & ~PAGE_MASK, false, false);
obj_request->pages, length,
offset & ~PAGE_MASK, false, false);
+ /*
+ * set obj_request->img_request before formatting
+ * the osd_request so that it gets the right snapc
+ */
+ rbd_img_obj_request_add(img_request, obj_request);
if (write_request)
rbd_osd_req_format_write(obj_request);
else
rbd_osd_req_format_read(obj_request);
obj_request->img_offset = img_offset;
if (write_request)
rbd_osd_req_format_write(obj_request);
else
rbd_osd_req_format_read(obj_request);
obj_request->img_offset = img_offset;
- rbd_img_obj_request_add(img_request, obj_request);
img_offset += length;
resid -= length;
img_offset += length;
resid -= length;