[PATCH] pass fmode_t to blkdev_put() (9a1c3542) · Commits · 戴 / test

drivers/block/pktcdvd.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -2381,7 +2381,7 @@ static int pkt_open_dev(struct pktcdvd_device *pd, fmode_t write)
		out_unclaim:
		bd_release(pd->bdev);
		out_putdev:
		blkdev_put(pd->bdev);
		blkdev_put(pd->bdev, FMODE_READ);
		out:
		return ret;
		}
		@@ -2399,7 +2399,7 @@ static void pkt_release_dev(struct pktcdvd_device *pd, int flush)

		pkt_set_speed(pd, MAX_SPEED, MAX_SPEED);
		bd_release(pd->bdev);
		blkdev_put(pd->bdev);
		blkdev_put(pd->bdev, FMODE_READ);

		pkt_shrink_pktlist(pd);
		}
		@@ -2790,7 +2790,7 @@ static int pkt_new_dev(struct pktcdvd_device *pd, dev_t dev)
		return 0;

		out_mem:
		blkdev_put(bdev);
		blkdev_put(bdev, FMODE_READ\|FMODE_WRITE);
		/* This is safe: open() is still holding a reference. */
		module_put(THIS_MODULE);
		return ret;
		@@ -2975,7 +2975,7 @@ static int pkt_remove_dev(dev_t pkt_dev)
		pkt_debugfs_dev_remove(pd);
		pkt_sysfs_dev_remove(pd);

		blkdev_put(pd->bdev);
		blkdev_put(pd->bdev, FMODE_READ\|FMODE_WRITE);

		remove_proc_entry(pd->name, pkt_proc);
		DPRINTK(DRIVER_NAME": writer %s unmapped\n", pd->name);

+2 −2

Original line number	Diff line number	Diff line
		@@ -87,7 +87,7 @@ static int raw_open(struct inode inode, struct file filp)
		out2:
		bd_release(bdev);
		out1:
		blkdev_put(bdev);
		blkdev_put(bdev, filp->f_mode);
		out:
		mutex_unlock(&raw_mutex);
		return err;
		@@ -112,7 +112,7 @@ static int raw_release(struct inode inode, struct file filp)
		mutex_unlock(&raw_mutex);

		bd_release(bdev);
		blkdev_put(bdev);
		blkdev_put(bdev, filp->f_mode);
		return 0;
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -357,7 +357,7 @@ static int open_dev(struct dm_dev_internal *d, dev_t dev,
		return PTR_ERR(bdev);
		r = bd_claim_by_disk(bdev, _claim_ptr, dm_disk(md));
		if (r)
		blkdev_put(bdev);
		blkdev_put(bdev, d->dm_dev.mode);
		else
		d->dm_dev.bdev = bdev;
		return r;
		@@ -372,7 +372,7 @@ static void close_dev(struct dm_dev_internal d, struct mapped_device md)
		return;

		bd_release_from_disk(d->dm_dev.bdev, dm_disk(md));
		blkdev_put(d->dm_dev.bdev);
		blkdev_put(d->dm_dev.bdev, d->dm_dev.mode);
		d->dm_dev.bdev = NULL;
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -1520,7 +1520,7 @@ static int lock_rdev(mdk_rdev_t *rdev, dev_t dev, int shared)
		if (err) {
		printk(KERN_ERR "md: could not bd_claim %s.\n",
		bdevname(bdev, b));
		blkdev_put(bdev);
		blkdev_put(bdev, FMODE_READ\|FMODE_WRITE);
		return err;
		}
		if (!shared)
		@@ -1536,7 +1536,7 @@ static void unlock_rdev(mdk_rdev_t *rdev)
		if (!bdev)
		MD_BUG();
		bd_release(bdev);
		blkdev_put(bdev);
		blkdev_put(bdev, FMODE_READ\|FMODE_WRITE);
		}

		void md_autodetect_dev(dev_t dev);

+1 −1

Original line number	Diff line number	Diff line
		@@ -152,7 +152,7 @@ void dasd_destroy_partitions(struct dasd_block *block)

		invalidate_partition(block->gdp, 0);
		/* Matching blkdev_put to the blkdev_get in dasd_scan_partitions. */
		blkdev_put(bdev);
		blkdev_put(bdev, FMODE_READ);
		set_capacity(block->gdp, 0);
		}