Commit ee763e21 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

zram: do not call set_blocksize 



set_blocksize is used by file systems to use their preferred buffer cache
block size.  Block drivers should not set it.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarMinchan Kim <minchan@kernel.org>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent a6419fd8

drivers/block/zram/zram_drv.c

+1 −10
Original line number Diff line number Diff line
@@ -403,13 +403,10 @@ static void reset_bdev(struct zram *zram) 
		return;



	bdev = zram->bdev;

	if (zram->old_block_size)

		set_blocksize(bdev, zram->old_block_size);

	blkdev_put(bdev, FMODE_READ|FMODE_WRITE|FMODE_EXCL);

	/* hope filp_close flush all of IO */

	filp_close(zram->backing_dev, NULL);

	zram->backing_dev = NULL;

	zram->old_block_size = 0;

	zram->bdev = NULL;

	zram->disk->fops = &zram_devops;

	kvfree(zram->bitmap);
@@ -454,7 +451,7 @@ static ssize_t backing_dev_store(struct device *dev, 
	struct file *backing_dev = NULL;

	struct inode *inode;

	struct address_space *mapping;

	unsigned int bitmap_sz, old_block_size = 0;

	unsigned int bitmap_sz;

	unsigned long nr_pages, *bitmap = NULL;

	struct block_device *bdev = NULL;

	int err;
@@ -509,14 +506,8 @@ static ssize_t backing_dev_store(struct device *dev, 
		goto out;

	}



	old_block_size = block_size(bdev);

	err = set_blocksize(bdev, PAGE_SIZE);

	if (err)

		goto out;



	reset_bdev(zram);



	zram->old_block_size = old_block_size;

	zram->bdev = bdev;

	zram->backing_dev = backing_dev;

	zram->bitmap = bitmap;

drivers/block/zram/zram_drv.h

+0 −1
Original line number Diff line number Diff line
@@ -118,7 +118,6 @@ struct zram { 
	bool wb_limit_enable;

	u64 bd_wb_limit;

	struct block_device *bdev;

	unsigned int old_block_size;

	unsigned long *bitmap;

	unsigned long nr_pages;

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE