aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/rbd.c14
1 files changed, 0 insertions, 14 deletions
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index 4d3a1e02130b..8a4659997e05 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -1718,8 +1718,6 @@ static int __rbd_refresh_header(struct rbd_device *rbd_dev)
1718{ 1718{
1719 int ret; 1719 int ret;
1720 struct rbd_image_header h; 1720 struct rbd_image_header h;
1721 u64 snap_seq;
1722 int follow_seq = 0;
1723 1721
1724 ret = rbd_read_header(rbd_dev, &h); 1722 ret = rbd_read_header(rbd_dev, &h);
1725 if (ret < 0) 1723 if (ret < 0)
@@ -1735,13 +1733,6 @@ static int __rbd_refresh_header(struct rbd_device *rbd_dev)
1735 set_capacity(rbd_dev->disk, size); 1733 set_capacity(rbd_dev->disk, size);
1736 } 1734 }
1737 1735
1738 snap_seq = rbd_dev->header.snapc->seq;
1739 if (rbd_dev->header.total_snaps &&
1740 rbd_dev->header.snapc->snaps[0] == snap_seq)
1741 /* pointing at the head, will need to follow that
1742 if head moves */
1743 follow_seq = 1;
1744
1745 /* rbd_dev->header.object_prefix shouldn't change */ 1736 /* rbd_dev->header.object_prefix shouldn't change */
1746 kfree(rbd_dev->header.snap_sizes); 1737 kfree(rbd_dev->header.snap_sizes);
1747 kfree(rbd_dev->header.snap_names); 1738 kfree(rbd_dev->header.snap_names);
@@ -1759,11 +1750,6 @@ static int __rbd_refresh_header(struct rbd_device *rbd_dev)
1759 WARN_ON(strcmp(rbd_dev->header.object_prefix, h.object_prefix)); 1750 WARN_ON(strcmp(rbd_dev->header.object_prefix, h.object_prefix));
1760 kfree(h.object_prefix); 1751 kfree(h.object_prefix);
1761 1752
1762 if (follow_seq)
1763 rbd_dev->header.snapc->seq = rbd_dev->header.snapc->snaps[0];
1764 else
1765 rbd_dev->header.snapc->seq = snap_seq;
1766
1767 ret = __rbd_init_snaps_header(rbd_dev); 1753 ret = __rbd_init_snaps_header(rbd_dev);
1768 1754
1769 up_write(&rbd_dev->header_rwsem); 1755 up_write(&rbd_dev->header_rwsem);