Hi Jens,
Today's linux-next build (x86_64 allmodconfig) failed like this:
fs/bio-integrity.c: At top level:
fs/bio-integrity.c:211: error: conflicting types for 'bdev_get_integrity'
fs/bio-integrity.c:155: error: previous implicit declaration of 'bdev_get_integrity' was here
Introduced by commit 1fd75f9b2e1c273ab145c9bf3e7a8afcbd8be87a ("block:
cleanup some of the integrity stuff in blkdev.h"). I applied the
following patch.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Thu, 18 Sep 2008 12:59:18 +1000
Subject: [PATCH] block: bdev_get_integrity needs to be defined earlier
Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
fs/bio-integrity.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/fs/bio-integrity.c b/fs/bio-integrity.c
index 78e5b56..ba4ada0 100644
--- a/fs/bio-integrity.c
+++ b/fs/bio-integrity.c
@@ -150,6 +150,11 @@ int bio_integrity_add_page(struct bio *bio, struct page *page,
}
EXPORT_SYMBOL(bio_integrity_add_page);
+static struct blk_integrity *bdev_get_integrity(struct block_device *bdev)
+{
+ return bdev->bd_disk->integrity;
+}
+
static int bdev_integrity_enabled(struct block_device *bdev, int rw)
{
struct blk_integrity *bi = bdev_get_integrity(bdev);
@@ -207,11 +212,6 @@ static inline unsigned int bio_integrity_hw_sectors(struct blk_integrity *bi,
return sectors;
}
-static struct blk_integrity *bdev_get_integrity(struct block_device *bdev)
-{
- return bdev->bd_disk->integrity;
-}
-
/**
* bio_integrity_tag_size - Retrieve integrity tag space
* @bio: bio to inspect
--
1.5.6.5
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
