diff options
| author | Jens Axboe <jaxboe@fusionio.com> | 2010-11-27 13:49:18 -0500 |
|---|---|---|
| committer | Jens Axboe <jaxboe@fusionio.com> | 2010-11-27 13:49:18 -0500 |
| commit | f30195c50245d8ace628e1978b1daa8df86e7224 (patch) | |
| tree | edf4f91c4356c41d50fb07f15cebd1e6442538ad /fs/ocfs2 | |
| parent | d07335e51df0c6dec202d315fc4f1f7e100eec4e (diff) | |
| parent | d4d77629953eabd3c14f6fa5746f6b28babfc55f (diff) | |
Merge branch 'cleanup-bd_claim' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc into for-2.6.38/core
Diffstat (limited to 'fs/ocfs2')
| -rw-r--r-- | fs/ocfs2/cluster/heartbeat.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ocfs2/cluster/heartbeat.c b/fs/ocfs2/cluster/heartbeat.c index 52c7557f3e25..d0a2721eaceb 100644 --- a/fs/ocfs2/cluster/heartbeat.c +++ b/fs/ocfs2/cluster/heartbeat.c | |||
| @@ -1674,7 +1674,7 @@ static ssize_t o2hb_region_dev_write(struct o2hb_region *reg, | |||
| 1674 | goto out; | 1674 | goto out; |
| 1675 | 1675 | ||
| 1676 | reg->hr_bdev = I_BDEV(filp->f_mapping->host); | 1676 | reg->hr_bdev = I_BDEV(filp->f_mapping->host); |
| 1677 | ret = blkdev_get(reg->hr_bdev, FMODE_WRITE | FMODE_READ); | 1677 | ret = blkdev_get(reg->hr_bdev, FMODE_WRITE | FMODE_READ, NULL); |
| 1678 | if (ret) { | 1678 | if (ret) { |
| 1679 | reg->hr_bdev = NULL; | 1679 | reg->hr_bdev = NULL; |
| 1680 | goto out; | 1680 | goto out; |