Commit 9228ff90 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-3.8/drivers' of git://git.kernel.dk/linux-block 

Pull block driver update from Jens Axboe:
 "Now that the core bits are in, here are the driver bits for 3.8.  The
  branch contains:

   - A huge pile of drbd bits that were dumped from the 3.7 merge
     window.  Following that, it was both made perfectly clear that
     there is going to be no more over-the-wall pulls and how the
     situation on individual pulls can be improved.

   - A few cleanups from Akinobu Mita for drbd and cciss.

   - Queue improvement for loop from Lukas.  This grew into adding a
     generic interface for waiting/checking an even with a specific
     lock, allowing this to be pulled out of md and now loop and drbd is
     also using it.

   - A few fixes for xen back/front block driver from Roger Pau Monne.

   - Partition improvements from Stephen Warren, allowing partiion UUID
     to be used as an identifier."

* 'for-3.8/drivers' of git://git.kernel.dk/linux-block: (609 commits)
  drbd: update Kconfig to match current dependencies
  drbd: Fix drbdsetup wait-connect, wait-sync etc... commands
  drbd: close race between drbd_set_role and drbd_connect
  drbd: respect no-md-barriers setting also when changed online via disk-options
  drbd: Remove obsolete check
  drbd: fixup after wait_even_lock_irq() addition to generic code
  loop: Limit the number of requests in the bio list
  wait: add wait_event_lock_irq() interface
  xen-blkfront: free allocated page
  xen-blkback: move free persistent grants code
  block: partition: msdos: provide UUIDs for partitions
  init: reduce PARTUUID min length to 1 from 36
  block: store partition_meta_info.uuid as a string
  cciss: use check_signature()
  cciss: cleanup bitops usage
  drbd: use copy_highpage
  drbd: if the replication link breaks during handshake, keep retrying
  drbd: check return of kmalloc in receive_uuids
  drbd: Broadcast sync progress no more often than once per second
  drbd: don't try to clear bits once the disk has failed
  ...
parents 9360b536 d2ec180c

block/genhd.c

+1 −7
Original line number Diff line number Diff line
@@ -743,7 +743,6 @@ void __init printk_all_partitions(void) 
		struct hd_struct *part;

		char name_buf[BDEVNAME_SIZE];

		char devt_buf[BDEVT_SIZE];

		char uuid_buf[PARTITION_META_INFO_UUIDLTH * 2 + 5];



		/*

		 * Don't show empty devices or things that have been
@@ -762,16 +761,11 @@ void __init printk_all_partitions(void) 
		while ((part = disk_part_iter_next(&piter))) {

			bool is_part0 = part == &disk->part0;



			uuid_buf[0] = '\0';

			if (part->info)

				snprintf(uuid_buf, sizeof(uuid_buf), "%pU",

					 part->info->uuid);



			printk("%s%s %10llu %s %s", is_part0 ? "" : "  ",

			       bdevt_str(part_devt(part), devt_buf),

			       (unsigned long long)part_nr_sects_read(part) >> 1

			       , disk_name(disk, part->partno, name_buf),

			       uuid_buf);

			       part->info ? part->info->uuid : "");

			if (is_part0) {

				if (disk->driverfs_dev != NULL &&

				    disk->driverfs_dev->driver != NULL)

block/partitions/efi.c

+1 −6
Original line number Diff line number Diff line
@@ -620,7 +620,6 @@ int efi_partition(struct parsed_partitions *state) 
	gpt_entry *ptes = NULL;

	u32 i;

	unsigned ssz = bdev_logical_block_size(state->bdev) / 512;

	u8 unparsed_guid[37];



	if (!find_valid_gpt(state, &gpt, &ptes) || !gpt || !ptes) {

		kfree(gpt);
@@ -649,11 +648,7 @@ int efi_partition(struct parsed_partitions *state) 
			state->parts[i + 1].flags = ADDPART_FLAG_RAID;



		info = &state->parts[i + 1].info;

		/* Instead of doing a manual swap to big endian, reuse the

		 * common ASCII hex format as the interim.

		 */

		efi_guid_unparse(&ptes[i].unique_partition_guid, unparsed_guid);

		part_pack_uuid(unparsed_guid, info->uuid);

		efi_guid_unparse(&ptes[i].unique_partition_guid, info->uuid);



		/* Naively convert UTF16-LE to 7 bits. */

		label_max = min(sizeof(info->volname) - 1,

block/partitions/msdos.c

+19 −2
Original line number Diff line number Diff line
@@ -94,6 +94,17 @@ static int aix_magic_present(struct parsed_partitions *state, unsigned char *p) 
	return ret;

}



static void set_info(struct parsed_partitions *state, int slot,

		     u32 disksig)

{

	struct partition_meta_info *info = &state->parts[slot].info;



	snprintf(info->uuid, sizeof(info->uuid), "%08x-%02x", disksig,

		 slot);

	info->volname[0] = 0;

	state->parts[slot].has_info = true;

}



/*

 * Create devices for each logical partition in an extended partition.

 * The logical partitions form a linked list, with each entry being
@@ -106,7 +117,8 @@ static int aix_magic_present(struct parsed_partitions *state, unsigned char *p) 
 */



static void parse_extended(struct parsed_partitions *state,

			   sector_t first_sector, sector_t first_size)

			   sector_t first_sector, sector_t first_size,

			   u32 disksig)

{

	struct partition *p;

	Sector sect;
@@ -166,6 +178,7 @@ static void parse_extended(struct parsed_partitions *state, 
			}



			put_partition(state, state->next, next, size);

			set_info(state, state->next, disksig);

			if (SYS_IND(p) == LINUX_RAID_PARTITION)

				state->parts[state->next].flags = ADDPART_FLAG_RAID;

			loopct = 0;
@@ -437,6 +450,7 @@ int msdos_partition(struct parsed_partitions *state) 
	struct partition *p;

	struct fat_boot_sector *fb;

	int slot;

	u32 disksig;



	data = read_part_sector(state, 0, &sect);

	if (!data)
@@ -491,6 +505,8 @@ int msdos_partition(struct parsed_partitions *state) 
#endif

	p = (struct partition *) (data + 0x1be);



	disksig = le32_to_cpup((__le32 *)(data + 0x1b8));



	/*

	 * Look for partitions in two passes:

	 * First find the primary and DOS-type extended partitions.
@@ -515,11 +531,12 @@ int msdos_partition(struct parsed_partitions *state) 
			put_partition(state, slot, start, n);



			strlcat(state->pp_buf, " <", PAGE_SIZE);

			parse_extended(state, start, size);

			parse_extended(state, start, size, disksig);

			strlcat(state->pp_buf, " >", PAGE_SIZE);

			continue;

		}

		put_partition(state, slot, start, size);

		set_info(state, slot, disksig);

		if (SYS_IND(p) == LINUX_RAID_PARTITION)

			state->parts[slot].flags = ADDPART_FLAG_RAID;

		if (SYS_IND(p) == DM6_PARTITION)

drivers/block/cciss.c

+7 −14
Original line number Diff line number Diff line
@@ -41,8 +41,9 @@ 
#include <linux/spinlock.h>

#include <linux/compat.h>

#include <linux/mutex.h>

#include <linux/bitmap.h>

#include <linux/io.h>

#include <asm/uaccess.h>

#include <asm/io.h>



#include <linux/dma-mapping.h>

#include <linux/blkdev.h>
@@ -978,8 +979,7 @@ static CommandList_struct *cmd_alloc(ctlr_info_t *h) 
		i = find_first_zero_bit(h->cmd_pool_bits, h->nr_cmds);

		if (i == h->nr_cmds)

			return NULL;

	} while (test_and_set_bit(i & (BITS_PER_LONG - 1),

		  h->cmd_pool_bits + (i / BITS_PER_LONG)) != 0);

	} while (test_and_set_bit(i, h->cmd_pool_bits) != 0);

	c = h->cmd_pool + i;

	memset(c, 0, sizeof(CommandList_struct));

	cmd_dma_handle = h->cmd_pool_dhandle + i * sizeof(CommandList_struct);
@@ -1046,8 +1046,7 @@ static void cmd_free(ctlr_info_t *h, CommandList_struct *c) 
	int i;



	i = c - h->cmd_pool;

	clear_bit(i & (BITS_PER_LONG - 1),

		  h->cmd_pool_bits + (i / BITS_PER_LONG));

	clear_bit(i, h->cmd_pool_bits);

	h->nr_frees++;

}
@@ -4268,10 +4267,7 @@ static void __devinit cciss_find_board_params(ctlr_info_t *h) 


static inline bool CISS_signature_present(ctlr_info_t *h)

{

	if ((readb(&h->cfgtable->Signature[0]) != 'C') ||

	    (readb(&h->cfgtable->Signature[1]) != 'I') ||

	    (readb(&h->cfgtable->Signature[2]) != 'S') ||

	    (readb(&h->cfgtable->Signature[3]) != 'S')) {

	if (!check_signature(h->cfgtable->Signature, "CISS", 4)) {

		dev_warn(&h->pdev->dev, "not a valid CISS config table\n");

		return false;

	}
@@ -4812,8 +4808,7 @@ static __devinit int cciss_init_reset_devices(struct pci_dev *pdev) 


static __devinit int cciss_allocate_cmd_pool(ctlr_info_t *h)

{

	h->cmd_pool_bits = kmalloc(

		DIV_ROUND_UP(h->nr_cmds, BITS_PER_LONG) *

	h->cmd_pool_bits = kmalloc(BITS_TO_LONGS(h->nr_cmds) *

		sizeof(unsigned long), GFP_KERNEL);

	h->cmd_pool = pci_alloc_consistent(h->pdev,

		h->nr_cmds * sizeof(CommandList_struct),
@@ -5068,9 +5063,7 @@ reinit_after_soft_reset: 
	pci_set_drvdata(pdev, h);

	/* command and error info recs zeroed out before

	   they are used */

	memset(h->cmd_pool_bits, 0,

	       DIV_ROUND_UP(h->nr_cmds, BITS_PER_LONG)

			* sizeof(unsigned long));

	bitmap_zero(h->cmd_pool_bits, h->nr_cmds);



	h->num_luns = 0;

	h->highest_lun = -1;

drivers/block/drbd/Kconfig

+6 −4
Original line number Diff line number Diff line
@@ -2,13 +2,14 @@ 
# DRBD device driver configuration

#



comment "DRBD disabled because PROC_FS, INET or CONNECTOR not selected"

	depends on PROC_FS='n' || INET='n' || CONNECTOR='n'

comment "DRBD disabled because PROC_FS or INET not selected"

	depends on PROC_FS='n' || INET='n'



config BLK_DEV_DRBD

	tristate "DRBD Distributed Replicated Block Device support"

	depends on PROC_FS && INET && CONNECTOR

	depends on PROC_FS && INET

	select LRU_CACHE

	select LIBCRC32C

	default n

	help
@@ -58,7 +59,8 @@ config DRBD_FAULT_INJECTION 
	  32	data read

	  64	read ahead

	  128	kmalloc of bitmap

	  256	allocation of EE (epoch_entries)

	  256	allocation of peer_requests

	  512	insert data corruption on receiving side



	  fault_devs: bitmask of minor numbers

	  fault_rate: frequency in percent

CRA Git | Maintained and supported by SUSTech CRA and CCSE