Merge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block (da79cbae) · Commits · 戴 / test

block/elevator.c

+7 −10

Original line number	Diff line number	Diff line
		@@ -93,21 +93,18 @@ static inline int elv_try_merge(struct request __rq, struct bio bio)

		static struct elevator_type elevator_find(const char name)
		{
		struct elevator_type *e = NULL;
		struct elevator_type *e;
		struct list_head *entry;

		list_for_each(entry, &elv_list) {
		struct elevator_type *__e;

		__e = list_entry(entry, struct elevator_type, list);
		e = list_entry(entry, struct elevator_type, list);

		if (!strcmp(__e->elevator_name, name)) {
		e = __e;
		break;
		}
		if (!strcmp(e->elevator_name, name))
		return e;
		}

		return e;
		return NULL;
		}

		static void elevator_put(struct elevator_type *e)
		@@ -1088,7 +1085,7 @@ ssize_t elv_iosched_show(request_queue_t q, char name)
		struct list_head *entry;
		int len = 0;

		spin_lock_irq(q->queue_lock);
		spin_lock_irq(&elv_list_lock);
		list_for_each(entry, &elv_list) {
		struct elevator_type *__e;

		@@ -1098,7 +1095,7 @@ ssize_t elv_iosched_show(request_queue_t q, char name)
		else
		len += sprintf(name+len, "%s ", __e->elevator_name);
		}
		spin_unlock_irq(q->queue_lock);
		spin_unlock_irq(&elv_list_lock);

		len += sprintf(len+name, "\n");
		return len;

+3 −2

Original line number	Diff line number	Diff line
		@@ -597,7 +597,7 @@ static void cdrom_prepare_request(ide_drive_t drive, struct request rq)
		struct cdrom_info *cd = drive->driver_data;

		ide_init_drive_cmd(rq);
		rq->cmd_type = REQ_TYPE_BLOCK_PC;
		rq->cmd_type = REQ_TYPE_ATA_PC;
		rq->rq_disk = cd->disk;
		}

		@@ -2023,7 +2023,8 @@ ide_do_rw_cdrom (ide_drive_t drive, struct request rq, sector_t block)
		}
		info->last_block = block;
		return action;
		} else if (rq->cmd_type == REQ_TYPE_SENSE) {
		} else if (rq->cmd_type == REQ_TYPE_SENSE \|\|
		rq->cmd_type == REQ_TYPE_ATA_PC) {
		return cdrom_do_packet_command(drive);
		} else if (blk_pc_request(rq)) {
		return cdrom_do_block_pc(drive, rq);

+0 −5

Original line number	Diff line number	Diff line
		@@ -150,11 +150,6 @@ int ioprio_best(unsigned short aprio, unsigned short bprio)
		unsigned short aclass = IOPRIO_PRIO_CLASS(aprio);
		unsigned short bclass = IOPRIO_PRIO_CLASS(bprio);

		if (!ioprio_valid(aprio))
		return bprio;
		if (!ioprio_valid(bprio))
		return aprio;

		if (aclass == IOPRIO_CLASS_NONE)
		aclass = IOPRIO_CLASS_BE;
		if (bclass == IOPRIO_CLASS_NONE)

+3 −3

Original line number	Diff line number	Diff line
		@@ -607,7 +607,7 @@ find_page:
		ret = -ENOMEM;
		page = page_cache_alloc_cold(mapping);
		if (unlikely(!page))
		goto out_nomem;
		goto out_ret;

		/*
		* This will also lock the page
		@@ -666,7 +666,7 @@ find_page:
		if (sd->pos + this_len > isize)
		vmtruncate(mapping->host, isize);

		goto out;
		goto out_ret;
		}

		if (buf->page != page) {
		@@ -698,7 +698,7 @@ find_page:
		out:
		page_cache_release(page);
		unlock_page(page);
		out_nomem:
		out_ret:
		return ret;
		}

+1 −0