block: remove unused ll_new_mergeable()
authorFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Mon, 20 Oct 2008 13:43:43 +0000 (15:43 +0200)
committerJens Axboe <jens.axboe@oracle.com>
Thu, 6 Nov 2008 07:41:55 +0000 (08:41 +0100)
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
block/blk-merge.c

index 8681cd6f9911427419b41b99f678e9eb623bbf5e..b92f5b0866b0972b80e5b7f69e1fae046608a90b 100644 (file)
@@ -222,27 +222,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)