UBUNTU: ubuntu: compcache -- follow changes to bd_claim/bd_release

Follow changes to bd_claim/bd_release semantics as per the upstream
commit below:

    commit e525fd89d380c4a94c0d63913a1dd1a593ed25e7
    Author: Tejun Heo <tj@kernel.org>
    Date:   Sat Nov 13 11:55:17 2010 +0100

	block: make blkdev_get/put() handle exclusive access

Signed-off-by: Andy Whitcroft <apw@canonical.com>

diff --git a/ubuntu/compcache/ramzswap.c b/ubuntu/compcache/ramzswap.c
index 3cd9c0e..d122408 100644 (file)
--- a/ubuntu/compcache/ramzswap.c
+++ b/ubuntu/compcache/ramzswap.c
@@ -213,7 +213,8 @@ static int setup_backing_swap(void)
 
        if (S_ISBLK(inode->i_mode)) {
                bdev = I_BDEV(inode);
-               error = bd_claim(bdev, ramzswap_init);
+               error = blkdev_get(bdev, O_RDWR | FMODE_EXCL, ramzswap_init);
+
                if (error < 0) {
                        bdev = NULL;
                        goto bad_param;
@@ -239,7 +240,7 @@ static int setup_backing_swap(void)
 bad_param:
        if (bdev) {
                set_blocksize(bdev, rzs.old_block_size);
-               bd_release(bdev);
+               blkdev_put(bdev, O_RDWR | FMODE_EXCL);
        }
        filp_close(swap_file, NULL);
 
@@ -963,7 +964,7 @@ static void __exit ramzswap_exit(void)
        /* Close backing swap device (if present) */
        if (rzs.backing_swap) {
                set_blocksize(rzs.backing_swap, rzs.old_block_size);
-               bd_release(rzs.backing_swap);
+               blkdev_put(rzs.backing_swap, O_RDWR | FMODE_EXCL);
                filp_close(rzs.swap_file, NULL);
        }