]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
PM / Hibernate: Replace bdget call with simple atomic_inc of i_count
authorAlan Jenkins <alan-jenkins@tuffmail.co.uk>
Wed, 29 Jul 2009 19:07:55 +0000 (21:07 +0200)
committerRafael J. Wysocki <rjw@sisk.pl>
Wed, 29 Jul 2009 19:07:55 +0000 (21:07 +0200)
Create bdgrab().  This function copies an existing reference to a
block_device.  It is safe to call from any context.

Hibernation code wishes to copy a reference to the active swap device.
Right now it calls bdget() under a spinlock, but this is wrong because
bdget() can sleep.  It doesn't need a full bdget() because we already
hold a reference to active swap devices (and the spinlock protects
against swapoff).

Fixes http://bugzilla.kernel.org/show_bug.cgi?id=13827

Signed-off-by: Alan Jenkins <alan-jenkins@tuffmail.co.uk>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
fs/block_dev.c
include/linux/fs.h
mm/swapfile.c

index 3a6d4fb2a329ceb5795bb18eec19ca71f330832b..94dfda24c06e5ea08b7df4883b640db573d137e7 100644 (file)
@@ -564,6 +564,16 @@ struct block_device *bdget(dev_t dev)
 
 EXPORT_SYMBOL(bdget);
 
+/**
+ * bdgrab -- Grab a reference to an already referenced block device
+ * @bdev:      Block device to grab a reference to.
+ */
+struct block_device *bdgrab(struct block_device *bdev)
+{
+       atomic_inc(&bdev->bd_inode->i_count);
+       return bdev;
+}
+
 long nr_blockdev_pages(void)
 {
        struct block_device *bdev;
index 0872372184fe159a62475b48a99a1a6a26d8f1cd..a36ffa5a77a4b2cbc45628e5eda30d4071828f6a 100644 (file)
@@ -1946,6 +1946,7 @@ extern void putname(const char *name);
 extern int register_blkdev(unsigned int, const char *);
 extern void unregister_blkdev(unsigned int, const char *);
 extern struct block_device *bdget(dev_t);
+extern struct block_device *bdgrab(struct block_device *bdev);
 extern void bd_set_size(struct block_device *, loff_t size);
 extern void bd_forget(struct inode *inode);
 extern void bdput(struct block_device *);
index d1ade1a48ee7b962852c7645bc08b15c67924050..8ffdc0d23c536fe04779a9c559af68f6d9470997 100644 (file)
@@ -753,7 +753,7 @@ int swap_type_of(dev_t device, sector_t offset, struct block_device **bdev_p)
 
                if (!bdev) {
                        if (bdev_p)
-                               *bdev_p = bdget(sis->bdev->bd_dev);
+                               *bdev_p = bdgrab(sis->bdev);
 
                        spin_unlock(&swap_lock);
                        return i;
@@ -765,7 +765,7 @@ int swap_type_of(dev_t device, sector_t offset, struct block_device **bdev_p)
                                        struct swap_extent, list);
                        if (se->start_block == offset) {
                                if (bdev_p)
-                                       *bdev_p = bdget(sis->bdev->bd_dev);
+                                       *bdev_p = bdgrab(sis->bdev);
 
                                spin_unlock(&swap_lock);
                                bdput(bdev);