Commit 39695224 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (209 commits)
  [SCSI] fix oops during scsi scanning
  [SCSI] libsrp: fix memory leak in srp_ring_free()
  [SCSI] libiscsi, bnx2i: make bound ep check common
  [SCSI] libiscsi: add completion function for drivers that do not need pdu processing
  [SCSI] scsi_dh_rdac: changes for rdac debug logging
  [SCSI] scsi_dh_rdac: changes to collect the rdac debug information during the initialization
  [SCSI] scsi_dh_rdac: move the init code from rdac_activate to rdac_bus_attach
  [SCSI] sg: fix oops in the error path in sg_build_indirect()
  [SCSI] mptsas : Bump version to 3.04.12
  [SCSI] mptsas : FW event thread and scsi mid layer deadlock in SYNCHRONIZE CACHE command
  [SCSI] mptsas : Send DID_NO_CONNECT for pending IOs of removed device
  [SCSI] mptsas : PAE Kernel more than 4 GB kernel panic
  [SCSI] mptsas : NULL pointer on big endian systems causing Expander not to tear off
  [SCSI] mptsas : Sanity check for phyinfo is added
  [SCSI] scsi_dh_rdac: Add support for Sun StorageTek ST2500, ST2510 and ST2530
  [SCSI] pmcraid: PMC-Sierra MaxRAID driver to support 6Gb/s SAS RAID controller
  [SCSI] qla2xxx: Update version number to 8.03.01-k6.
  [SCSI] qla2xxx: Properly delete rports attached to a vport.
  [SCSI] qla2xxx: Correct various NPIV issues.
  [SCSI] qla2xxx: Correct qla2x00_eh_wait_on_command() to wait correctly.
  ...
parents a9bbd210 ea038f63

MAINTAINERS

+9 −1
Original line number Diff line number Diff line
@@ -4009,6 +4009,14 @@ S: Maintained 
F:	drivers/block/pktcdvd.c

F:	include/linux/pktcdvd.h



PMC SIERRA MaxRAID DRIVER

P:	Anil Ravindranath

M:	anil_ravindranath@pmc-sierra.com

L:	linux-scsi@vger.kernel.org

W:	http://www.pmc-sierra.com/

S:	Supported

F:	drivers/scsi/pmcraid.*



POSIX CLOCKS and TIMERS

M:	Thomas Gleixner <tglx@linutronix.de>

S:	Supported
@@ -4447,7 +4455,7 @@ F: drivers/scsi/sg.c 
F:	include/scsi/sg.h



SCSI SUBSYSTEM

M:	"James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>

M:	"James E.J. Bottomley" <James.Bottomley@suse.de>

L:	linux-scsi@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6.git

arch/s390/include/asm/timex.h

+8 −0
Original line number Diff line number Diff line
@@ -88,6 +88,14 @@ int get_sync_clock(unsigned long long *clock); 
void init_cpu_timer(void);

unsigned long long monotonic_clock(void);



void tod_to_timeval(__u64, struct timespec *);



static inline

void stck_to_timespec(unsigned long long stck, struct timespec *ts)

{

	tod_to_timeval(stck - TOD_UNIX_EPOCH, ts);

}



extern u64 sched_clock_base_cc;



/**

arch/s390/kernel/debug.c

+1 −7
Original line number Diff line number Diff line
@@ -63,8 +63,6 @@ typedef struct 
} debug_sprintf_entry_t;





extern void tod_to_timeval(uint64_t todval, struct timespec *xtime);



/* internal function prototyes */



static int debug_init(void);
@@ -1450,17 +1448,13 @@ debug_dflt_header_fn(debug_info_t * id, struct debug_view *view, 
			 int area, debug_entry_t * entry, char *out_buf)

{

	struct timespec time_spec;

	unsigned long long time;

	char *except_str;

	unsigned long caller;

	int rc = 0;

	unsigned int level;



	level = entry->id.fields.level;

	time = entry->id.stck;

	/* adjust todclock to 1970 */

	time -= 0x8126d60e46000000LL - (0x3c26700LL * 1000000 * 4096);

	tod_to_timeval(time, &time_spec);

	stck_to_timespec(entry->id.stck, &time_spec);



	if (entry->id.fields.exception)

		except_str = "*";

arch/s390/kernel/time.c

+1 −0
Original line number Diff line number Diff line
@@ -91,6 +91,7 @@ void tod_to_timeval(__u64 todval, struct timespec *xtime) 
	todval -= (sec * 1000000) << 12;

	xtime->tv_nsec = ((todval * 1000) >> 12);

}

EXPORT_SYMBOL(tod_to_timeval);



void clock_comparator_work(void)

{

drivers/md/dm-mpath.c

+36 −6
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ struct multipath { 
	spinlock_t lock;



	const char *hw_handler_name;

	char *hw_handler_params;

	unsigned nr_priority_groups;

	struct list_head priority_groups;

	unsigned pg_init_required;	/* pg_init needs calling? */
@@ -219,6 +220,7 @@ static void free_multipath(struct multipath *m) 
	}



	kfree(m->hw_handler_name);

	kfree(m->hw_handler_params);

	mempool_destroy(m->mpio_pool);

	kfree(m);

}
@@ -615,6 +617,17 @@ static struct pgpath *parse_path(struct arg_set *as, struct path_selector *ps, 
			dm_put_device(ti, p->path.dev);

			goto bad;

		}



		if (m->hw_handler_params) {

			r = scsi_dh_set_params(q, m->hw_handler_params);

			if (r < 0) {

				ti->error = "unable to set hardware "

							"handler parameters";

				scsi_dh_detach(q);

				dm_put_device(ti, p->path.dev);

				goto bad;

			}

		}

	}



	r = ps->type->add_path(ps, &p->path, as->argc, as->argv, &ti->error);
@@ -705,6 +718,7 @@ static struct priority_group *parse_priority_group(struct arg_set *as, 
static int parse_hw_handler(struct arg_set *as, struct multipath *m)

{

	unsigned hw_argc;

	int ret;

	struct dm_target *ti = m->ti;



	static struct param _params[] = {
@@ -726,17 +740,33 @@ static int parse_hw_handler(struct arg_set *as, struct multipath *m) 
	request_module("scsi_dh_%s", m->hw_handler_name);

	if (scsi_dh_handler_exist(m->hw_handler_name) == 0) {

		ti->error = "unknown hardware handler type";

		kfree(m->hw_handler_name);

		m->hw_handler_name = NULL;

		return -EINVAL;

		ret = -EINVAL;

		goto fail;

	}



	if (hw_argc > 1)

		DMWARN("Ignoring user-specified arguments for "

		       "hardware handler \"%s\"", m->hw_handler_name);

	if (hw_argc > 1) {

		char *p;

		int i, j, len = 4;



		for (i = 0; i <= hw_argc - 2; i++)

			len += strlen(as->argv[i]) + 1;

		p = m->hw_handler_params = kzalloc(len, GFP_KERNEL);

		if (!p) {

			ti->error = "memory allocation failed";

			ret = -ENOMEM;

			goto fail;

		}

		j = sprintf(p, "%d", hw_argc - 1);

		for (i = 0, p+=j+1; i <= hw_argc - 2; i++, p+=j+1)

			j = sprintf(p, "%s", as->argv[i]);

	}

	consume(as, hw_argc - 1);



	return 0;

fail:

	kfree(m->hw_handler_name);

	m->hw_handler_name = NULL;

	return ret;

}



static int parse_features(struct arg_set *as, struct multipath *m)

CRA Git | Maintained and supported by SUSTech CRA and CCSE