From 4ec905eb8de1b264e68ce81b1828fa2330d1f048 Mon Sep 17 00:00:00 2001 From: Lars Ellenberg Date: Thu, 8 Mar 2012 12:01:56 +0100 Subject: [PATCH] --- yaml --- r: 309337 b: refs/heads/master c: 7ffcaa7194e2c96a738b936d2ae71c7f0c697c0a h: refs/heads/master i: 309335: 376761419045d07d8676bc95ff66e602dba32693 v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_int.h | 14 -------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/[refs] b/[refs] index 7abd19acbe94..cc89cdb0ee3b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a5d214f621d47ffb89d294838006d30869050297 +refs/heads/master: 7ffcaa7194e2c96a738b936d2ae71c7f0c697c0a diff --git a/trunk/drivers/block/drbd/drbd_int.h b/trunk/drivers/block/drbd/drbd_int.h index fff8f790f79d..746f7933bf86 100644 --- a/trunk/drivers/block/drbd/drbd_int.h +++ b/trunk/drivers/block/drbd/drbd_int.h @@ -1751,19 +1751,6 @@ static inline struct page *page_chain_next(struct page *page) #define page_chain_for_each_safe(page, n) \ for (; page && ({ n = page_chain_next(page); 1; }); page = n) -static inline int drbd_bio_has_active_page(struct bio *bio) -{ - struct bio_vec *bvec; - int i; - - __bio_for_each_segment(bvec, bio, i, 0) { - if (page_count(bvec->bv_page) > 1) - return 1; - } - - return 0; -} - static inline int drbd_ee_has_active_page(struct drbd_epoch_entry *e) { struct page *page = e->pages; @@ -1774,7 +1761,6 @@ static inline int drbd_ee_has_active_page(struct drbd_epoch_entry *e) return 0; } - static inline void drbd_state_lock(struct drbd_conf *mdev) { wait_event(mdev->misc_wait,