2008-10-11 06:51:31

by FUJITA Tomonori

[permalink] [raw]
Subject: [PATCH] block: remove unused ll_new_mergeable()

This is against the latest git (b922df7383749a1c0b7ea64c50fa839263d3816b).
=
From: FUJITA Tomonori <[email protected]>
Subject: [PATCH] block: remove unused ll_new_mergeable()

Signed-off-by: FUJITA Tomonori <[email protected]>
---
block/blk-merge.c | 21 ---------------------
1 files changed, 0 insertions(+), 21 deletions(-)

diff --git a/block/blk-merge.c b/block/blk-merge.c
index 68b0f1e..37bcfc9 100644
--- a/block/blk-merge.c
+++ b/block/blk-merge.c
@@ -218,27 +218,6 @@ new_segment:
}
EXPORT_SYMBOL(blk_rq_map_sg);

-static inline int ll_new_mergeable(struct request_queue *q,
- struct request *req,
- struct bio *bio)
-{
- int nr_phys_segs = bio_phys_segments(q, bio);
-
- if (req->nr_phys_segments + nr_phys_segs > q->max_phys_segments) {
- req->cmd_flags |= REQ_NOMERGE;
- if (req == q->last_merge)
- q->last_merge = NULL;
- return 0;
- }
-
- /*
- * A hw segment is just getting larger, bump just the phys
- * counter.
- */
- req->nr_phys_segments += nr_phys_segs;
- return 1;
-}
-
static inline int ll_new_hw_segment(struct request_queue *q,
struct request *req,
struct bio *bio)
--
1.5.5.GIT


2008-10-20 05:12:18

by FUJITA Tomonori

[permalink] [raw]
Subject: Re: [PATCH] block: remove unused ll_new_mergeable()

On Sat, 11 Oct 2008 15:38:08 +0900
FUJITA Tomonori <[email protected]> wrote:

> This is against the latest git (b922df7383749a1c0b7ea64c50fa839263d3816b).
> =
> From: FUJITA Tomonori <[email protected]>
> Subject: [PATCH] block: remove unused ll_new_mergeable()
>
> Signed-off-by: FUJITA Tomonori <[email protected]>
> ---
> block/blk-merge.c | 21 ---------------------
> 1 files changed, 0 insertions(+), 21 deletions(-)

Ping. Any reason to keep this function?


> diff --git a/block/blk-merge.c b/block/blk-merge.c
> index 68b0f1e..37bcfc9 100644
> --- a/block/blk-merge.c
> +++ b/block/blk-merge.c
> @@ -218,27 +218,6 @@ new_segment:
> }
> EXPORT_SYMBOL(blk_rq_map_sg);
>
> -static inline int ll_new_mergeable(struct request_queue *q,
> - struct request *req,
> - struct bio *bio)
> -{
> - int nr_phys_segs = bio_phys_segments(q, bio);
> -
> - if (req->nr_phys_segments + nr_phys_segs > q->max_phys_segments) {
> - req->cmd_flags |= REQ_NOMERGE;
> - if (req == q->last_merge)
> - q->last_merge = NULL;
> - return 0;
> - }
> -
> - /*
> - * A hw segment is just getting larger, bump just the phys
> - * counter.
> - */
> - req->nr_phys_segments += nr_phys_segs;
> - return 1;
> -}
> -
> static inline int ll_new_hw_segment(struct request_queue *q,
> struct request *req,
> struct bio *bio)
> --
> 1.5.5.GIT
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/

2008-10-20 05:36:50

by Jens Axboe

[permalink] [raw]
Subject: Re: [PATCH] block: remove unused ll_new_mergeable()

On Mon, Oct 20 2008, FUJITA Tomonori wrote:
> On Sat, 11 Oct 2008 15:38:08 +0900
> FUJITA Tomonori <[email protected]> wrote:
>
> > This is against the latest git (b922df7383749a1c0b7ea64c50fa839263d3816b).
> > =
> > From: FUJITA Tomonori <[email protected]>
> > Subject: [PATCH] block: remove unused ll_new_mergeable()
> >
> > Signed-off-by: FUJITA Tomonori <[email protected]>
> > ---
> > block/blk-merge.c | 21 ---------------------
> > 1 files changed, 0 insertions(+), 21 deletions(-)
>
> Ping. Any reason to keep this function?

Not at all, I thought I had already merged this up - woops! Applied,
thanks.

--
Jens Axboe