block: remove remaining __FUNCTION__ occurrences (24c03d47) · Commits · 戴 / test

block/blk-barrier.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -26,8 +26,7 @@ int blk_queue_ordered(struct request_queue *q, unsigned ordered,
		{
		if (ordered & (QUEUE_ORDERED_PREFLUSH \| QUEUE_ORDERED_POSTFLUSH) &&
		prepare_flush_fn == NULL) {
		printk(KERN_ERR "%s: prepare_flush_fn required\n",
		__FUNCTION__);
		printk(KERN_ERR "%s: prepare_flush_fn required\n", __func__);
		return -EINVAL;
		}

block/blk-core.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -136,7 +136,7 @@ static void req_bio_endio(struct request rq, struct bio bio,

		if (unlikely(nbytes > bio->bi_size)) {
		printk(KERN_ERR "%s: want %u bytes done, %u left\n",
		__FUNCTION__, nbytes, bio->bi_size);
		__func__, nbytes, bio->bi_size);
		nbytes = bio->bi_size;
		}

		@@ -1566,8 +1566,7 @@ static int __end_that_request_first(struct request *req, int error,
		if (unlikely(bio->bi_idx >= bio->bi_vcnt)) {
		blk_dump_rq_flags(req, "__end_that");
		printk(KERN_ERR "%s: bio idx %d >= vcnt %d\n",
		__FUNCTION__, bio->bi_idx,
		bio->bi_vcnt);
		__func__, bio->bi_idx, bio->bi_vcnt);
		break;
		}

block/blk-settings.c

+10 −10

Original line number	Diff line number	Diff line
		@@ -168,8 +168,8 @@ void blk_queue_max_sectors(struct request_queue *q, unsigned int max_sectors)
		{
		if ((max_sectors << 9) < PAGE_CACHE_SIZE) {
		max_sectors = 1 << (PAGE_CACHE_SHIFT - 9);
		printk(KERN_INFO "%s: set to minimum %d\n", __FUNCTION__,
		max_sectors);
		printk(KERN_INFO "%s: set to minimum %d\n",
		__func__, max_sectors);
		}

		if (BLK_DEF_MAX_SECTORS > max_sectors)
		@@ -196,8 +196,8 @@ void blk_queue_max_phys_segments(struct request_queue *q,
		{
		if (!max_segments) {
		max_segments = 1;
		printk(KERN_INFO "%s: set to minimum %d\n", __FUNCTION__,
		max_segments);
		printk(KERN_INFO "%s: set to minimum %d\n",
		__func__, max_segments);
		}

		q->max_phys_segments = max_segments;
		@@ -220,8 +220,8 @@ void blk_queue_max_hw_segments(struct request_queue *q,
		{
		if (!max_segments) {
		max_segments = 1;
		printk(KERN_INFO "%s: set to minimum %d\n", __FUNCTION__,
		max_segments);
		printk(KERN_INFO "%s: set to minimum %d\n",
		__func__, max_segments);
		}

		q->max_hw_segments = max_segments;
		@@ -241,8 +241,8 @@ void blk_queue_max_segment_size(struct request_queue *q, unsigned int max_size)
		{
		if (max_size < PAGE_CACHE_SIZE) {
		max_size = PAGE_CACHE_SIZE;
		printk(KERN_INFO "%s: set to minimum %d\n", __FUNCTION__,
		max_size);
		printk(KERN_INFO "%s: set to minimum %d\n",
		__func__, max_size);
		}

		q->max_segment_size = max_size;
		@@ -357,8 +357,8 @@ void blk_queue_segment_boundary(struct request_queue *q, unsigned long mask)
		{
		if (mask < PAGE_CACHE_SIZE - 1) {
		mask = PAGE_CACHE_SIZE - 1;
		printk(KERN_INFO "%s: set to minimum %lx\n", __FUNCTION__,
		mask);
		printk(KERN_INFO "%s: set to minimum %lx\n",
		__func__, mask);
		}

		q->seg_boundary_mask = mask;

block/blk-tag.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -112,7 +112,7 @@ init_tag_map(struct request_queue q, struct blk_queue_tag tags, int depth)
		if (q && depth > q->nr_requests * 2) {
		depth = q->nr_requests * 2;
		printk(KERN_ERR "%s: adjusted depth to %d\n",
		__FUNCTION__, depth);
		__func__, depth);
		}

		tag_index = kzalloc(depth * sizeof(struct request *), GFP_ATOMIC);
		@@ -296,13 +296,13 @@ void blk_queue_end_tag(struct request_queue q, struct request rq)

		if (unlikely(bqt->tag_index[tag] == NULL))
		printk(KERN_ERR "%s: tag %d is missing\n",
		__FUNCTION__, tag);
		__func__, tag);

		bqt->tag_index[tag] = NULL;

		if (unlikely(!test_bit(tag, bqt->tag_map))) {
		printk(KERN_ERR "%s: attempt to clear non-busy tag (%d)\n",
		__FUNCTION__, tag);
		__func__, tag);
		return;
		}
		/*
		@@ -340,7 +340,7 @@ int blk_queue_start_tag(struct request_queue q, struct request rq)
		if (unlikely((rq->cmd_flags & REQ_QUEUED))) {
		printk(KERN_ERR
		"%s: request %p for device [%s] already tagged %d",
		__FUNCTION__, rq,
		__func__, rq,
		rq->rq_disk ? rq->rq_disk->disk_name : "?", rq->tag);
		BUG();
		}

block/bsg.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -57,7 +57,7 @@ enum {
		#undef BSG_DEBUG

		#ifdef BSG_DEBUG
		#define dprintk(fmt, args...) printk(KERN_ERR "%s: " fmt, __FUNCTION__, ##args)
		#define dprintk(fmt, args...) printk(KERN_ERR "%s: " fmt, __func__, ##args)
		#else
		#define dprintk(fmt, args...)
		#endif

Admin message