UBUNTU: Ubuntu-raspi2-4.10.0-1002.4

[mirror_ubuntu-zesty-kernel.git] / drivers / block / nbd.c

diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 9fd06eeb1a17b3880e2ad574f4ca081903a67961..a4235526b270a7d837870c3bc1feace9ff9991a9 100644 (file)
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -90,7 +90,7 @@ static struct dentry *nbd_dbg_dir;
 
 static unsigned int nbds_max = 16;
 static struct nbd_device *nbd_dev;
-static int max_part;
+static int max_part = 15;
 
 static inline struct device *nbd_to_dev(struct nbd_device *nbd)
 {
@@ -128,8 +128,6 @@ static void nbd_size_update(struct nbd_device *nbd, struct block_device *bdev)
        if (!nbd_is_connected(nbd))
                return;
 
-       bdev->bd_inode->i_size = nbd->bytesize;
-       set_capacity(nbd->disk, nbd->bytesize >> 9);
        kobject_uevent(&nbd_to_dev(nbd)->kobj, KOBJ_CHANGE);
 }
 
@@ -145,6 +143,8 @@ static int nbd_size_set(struct nbd_device *nbd, struct block_device *bdev,
        nbd->blksize = blocksize;
        nbd->bytesize = blocksize * nr_blocks;
 
+       bdev->bd_inode->i_size = nbd->bytesize;
+       set_capacity(nbd->disk, nbd->bytesize >> 9);
        nbd_size_update(nbd, bdev);
 
        return 0;