summaryrefslogtreecommitdiffstats
path: root/fs/ocfs2/cluster/heartbeat.c
diff options
context:
space:
mode:
authorMathieu Avila <mathieu.avila@seanodes.com>2006-09-13 20:11:27 +0200
committerMark Fasheh <mark.fasheh@oracle.com>2006-09-21 00:50:53 +0200
commit471e3f57286da7ce8820ad42c77d5f5f49d56a41 (patch)
tree763078566e354815f0c48684c48b618506be73d3 /fs/ocfs2/cluster/heartbeat.c
parent[PATCH] fs/ocfs2/ioctl.c should #include "ioctl.h" (diff)
downloadlinux-471e3f57286da7ce8820ad42c77d5f5f49d56a41.tar.xz
linux-471e3f57286da7ce8820ad42c77d5f5f49d56a41.zip
ocfs2: Fix heartbeat sector calculation
This fixes things for devices which set max_sectors to 8. Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
Diffstat (limited to '')
-rw-r--r--fs/ocfs2/cluster/heartbeat.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/fs/ocfs2/cluster/heartbeat.c b/fs/ocfs2/cluster/heartbeat.c
index 504595d6cf65..305cba3681fe 100644
--- a/fs/ocfs2/cluster/heartbeat.c
+++ b/fs/ocfs2/cluster/heartbeat.c
@@ -320,8 +320,12 @@ static int compute_max_sectors(struct block_device *bdev)
max_pages = q->max_hw_segments;
max_pages--; /* Handle I/Os that straddle a page */
- max_sectors = max_pages << (PAGE_SHIFT - 9);
-
+ if (max_pages) {
+ max_sectors = max_pages << (PAGE_SHIFT - 9);
+ } else {
+ /* If BIO contains 1 or less than 1 page. */
+ max_sectors = q->max_sectors;
+ }
/* Why is fls() 1-based???? */
pow_two_sectors = 1 << (fls(max_sectors) - 1);