diff --git a/[refs] b/[refs] index 84c54ffb0df1..267703115dd9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8b84de7940b69fd7326946ba244621aa5fc412e0 +refs/heads/master: e0b49868d3629708eda593b6739cb78f33ab238a diff --git a/trunk/drivers/block/rbd.c b/trunk/drivers/block/rbd.c index a3a11c3c1cac..007b726ea0eb 100644 --- a/trunk/drivers/block/rbd.c +++ b/trunk/drivers/block/rbd.c @@ -2802,7 +2802,7 @@ static char *rbd_dev_v2_snap_name(struct rbd_device *rbd_dev, u32 which) static char *rbd_dev_v2_snap_info(struct rbd_device *rbd_dev, u32 which, u64 *snap_size, u64 *snap_features) { - __le64 snap_id; + u64 snap_id; u8 order; int ret;