diff --git a/block/bdev.c b/block/bdev.c index 6f73b02d549c..9fdf2dbc450e 100644 --- a/block/bdev.c +++ b/block/bdev.c @@ -130,12 +130,14 @@ static void set_init_blocksize(struct block_device *bdev) unsigned int bsize = bdev_logical_block_size(bdev); loff_t size = i_size_read(bdev->bd_inode); + printk("s: %llu, %s\n", size, __func__); while (bsize < PAGE_SIZE) { if (size & bsize) break; bsize <<= 1; } bdev->bd_inode->i_blkbits = blksize_bits(bsize); + printk("out s: %llu, %s\n", size, __func__); } int set_blocksize(struct block_device *bdev, int size) @@ -870,6 +872,7 @@ struct bdev_handle *bdev_open_by_dev(dev_t dev, blk_mode_t mode, void *holder, if (ret) goto put_module; bdev_claim_write_access(bdev, mode); + printk("%p, h: %p, %s\n", bdev, holder, __func__); if (holder) { bd_finish_claiming(bdev, holder, hops); @@ -887,6 +890,7 @@ struct bdev_handle *bdev_open_by_dev(dev_t dev, blk_mode_t mode, void *holder, } } mutex_unlock(&disk->open_mutex); + printk("out om, b: %p, disk: %p, %s\n", bdev, disk, __func__); if (unblock_events) disk_unblock_events(disk); @@ -900,6 +904,7 @@ struct bdev_handle *bdev_open_by_dev(dev_t dev, blk_mode_t mode, void *holder, if (holder) bd_abort_claiming(bdev, holder); mutex_unlock(&disk->open_mutex); + printk("out om, b: %p, %s\n", bdev, __func__); disk_unblock_events(disk); put_blkdev: blkdev_put_no_open(bdev); @@ -964,6 +969,7 @@ void bdev_release(struct bdev_handle *handle) if (atomic_read(&bdev->bd_openers) == 1) sync_blockdev(bdev); + printk("nxt om, b: %p, dk: %p, %s\n", bdev, disk, __func__); mutex_lock(&disk->open_mutex); bdev_yield_write_access(bdev, handle->mode); @@ -982,6 +988,7 @@ void bdev_release(struct bdev_handle *handle) else blkdev_put_whole(bdev); mutex_unlock(&disk->open_mutex); + printk("out om, b: %p, dk: %p, %s\n", bdev, disk, __func__); module_put(disk->fops->owner); blkdev_put_no_open(bdev); diff --git a/block/partitions/core.c b/block/partitions/core.c index f47ffcfdfcec..e48c26513f4d 100644 --- a/block/partitions/core.c +++ b/block/partitions/core.c @@ -698,6 +698,7 @@ int bdev_disk_changed(struct gendisk *disk, bool invalidate) if (get_capacity(disk)) { ret = blk_add_partitions(disk); + printk("r: %d, disk: %p, %s\n", ret, disk, __func__); if (ret == -EAGAIN) goto rescan; } else if (invalidate) { @@ -708,6 +709,7 @@ int bdev_disk_changed(struct gendisk *disk, bool invalidate) kobject_uevent(&disk_to_dev(disk)->kobj, KOBJ_CHANGE); } + printk("disk: %p, %s\n", disk, __func__); return ret; } /* diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c index b6414e1e645b..090cdef5899d 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c @@ -1137,6 +1137,7 @@ static int nbd_add_socket(struct nbd_device *nbd, unsigned long arg, int err; /* Arg will be cast to int, check it to avoid overflow */ + printk("arg: %d, nbd: %p, %s\n", arg, nbd, __func__); if (arg > INT_MAX) return -EINVAL; sock = nbd_get_socket(nbd, arg, &err); @@ -1188,10 +1189,12 @@ static int nbd_add_socket(struct nbd_device *nbd, unsigned long arg, socks[config->num_connections++] = nsock; atomic_inc(&config->live_connections); blk_mq_unfreeze_queue(nbd->disk->queue); + printk("arg: %d, nbd: %p, nd: %p, nc: %d, %s\n", arg, nbd, nbd->disk, config->num_connections, __func__); return 0; put_socket: + printk("nbd: %p, %s\n", nbd, __func__); blk_mq_unfreeze_queue(nbd->disk->queue); sockfd_put(sock); return err; @@ -1372,6 +1375,7 @@ static int nbd_start_device(struct nbd_device *nbd) int num_connections = config->num_connections; int error = 0, i; + printk("dev: %p, nc: %d, pid: %d, socks: %p, %s\n", nbd, num_connections, nbd->pid, config->socks, __func__); if (nbd->pid) return -EBUSY; if (!config->socks) @@ -1425,6 +1429,7 @@ static int nbd_start_device(struct nbd_device *nbd) args->index = i; queue_work(nbd->recv_workq, &args->work); } + printk("bs: %lld, blks: %lld, %s\n", config->bytesize, nbd_blksize(config), __func__); return nbd_set_size(nbd, config->bytesize, nbd_blksize(config)); } @@ -1596,6 +1601,7 @@ static int nbd_open(struct gendisk *disk, blk_mode_t mode) struct nbd_config *config; int ret = 0; + printk("d: %p, %s\n", disk, __func__); mutex_lock(&nbd_index_mutex); nbd = disk->private_data; if (!nbd) { @@ -1629,6 +1635,7 @@ static int nbd_open(struct gendisk *disk, blk_mode_t mode) set_bit(GD_NEED_PART_SCAN, &disk->state); } out: + printk("ret: %d, out, d: %p, %s\n", ret, disk, __func__); mutex_unlock(&nbd_index_mutex); return ret; }