diff options
| author | Andy Whitcroft <apw@canonical.com> | 2011-08-25 17:01:40 +0100 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2011-09-23 08:58:00 -0600 |
| commit | b1ce390a0cd1e5ea8ad3fd3611f7ec52578ea2cd (patch) | |
| tree | 683bfe08d87ba884eae56e239ee192092681fca0 /ubuntu | |
| parent | 238eebf15a0951af0fc445689019525ea18cc60c (diff) | |
Revert "UBUNTU: ubuntu: compcache -- follow changes to bd_claim/bd_release"
This reverts commit f2e26a6e771a6c14eedf001c16e7efcf07d17111.
BugLink: http://bugs.launchpad.net/bugs/832694
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Diffstat (limited to 'ubuntu')
| -rw-r--r-- | ubuntu/compcache/ramzswap.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/ubuntu/compcache/ramzswap.c b/ubuntu/compcache/ramzswap.c index d122408e04d..3cd9c0e7304 100644 --- a/ubuntu/compcache/ramzswap.c +++ b/ubuntu/compcache/ramzswap.c @@ -213,8 +213,7 @@ static int setup_backing_swap(void) if (S_ISBLK(inode->i_mode)) { bdev = I_BDEV(inode); - error = blkdev_get(bdev, O_RDWR | FMODE_EXCL, ramzswap_init); - + error = bd_claim(bdev, ramzswap_init); if (error < 0) { bdev = NULL; goto bad_param; @@ -240,7 +239,7 @@ static int setup_backing_swap(void) bad_param: if (bdev) { set_blocksize(bdev, rzs.old_block_size); - blkdev_put(bdev, O_RDWR | FMODE_EXCL); + bd_release(bdev); } filp_close(swap_file, NULL); @@ -964,7 +963,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); - blkdev_put(rzs.backing_swap, O_RDWR | FMODE_EXCL); + bd_release(rzs.backing_swap); filp_close(rzs.swap_file, NULL); } |