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

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

Pull block driver update from Jens Axboe:
 "On top of the core pull request, here's the pull request for the
  driver related changes for 3.15.  It contains:

   - Improvements for msi-x registration for block drivers (mtip32xx,
     skd, cciss, nvme) from Alexander Gordeev.

   - A round of cleanups and improvements for drbd from Andreas
     Gruenbacher and Rashika Kheria.

   - A round of clanups and improvements for bcache from Kent.

   - Removal of sleep_on() and friends in DAC960, ataflop, swim3 from
     Arnd Bergmann.

   - Bug fix for a bug in the mtip32xx async completion code from Sam
     Bradshaw.

   - Bug fix for accidentally bouncing IO on 32-bit platforms with
     mtip32xx from Felipe Franciosi"

* 'for-3.15/drivers' of git://git.kernel.dk/linux-block: (103 commits)
  bcache: remove nested function usage
  bcache: Kill bucket->gc_gen
  bcache: Kill unused freelist
  bcache: Rework btree cache reserve handling
  bcache: Kill btree_io_wq
  bcache: btree locking rework
  bcache: Fix a race when freeing btree nodes
  bcache: Add a real GC_MARK_RECLAIMABLE
  bcache: Add bch_keylist_init_single()
  bcache: Improve priority_stats
  bcache: Better alloc tracepoints
  bcache: Kill dead cgroup code
  bcache: stop moving_gc marking buckets that can't be moved.
  bcache: Fix moving_pred()
  bcache: Fix moving_gc deadlocking with a foreground write
  bcache: Fix discard granularity
  bcache: Fix another bug recovering from unclean shutdown
  bcache: Fix a bug recovering from unclean shutdown
  bcache: Fix a journalling reclaim after recovery bug
  bcache: Fix a null ptr deref in journal replay
  ...
parents 7a488377 e84987a1

Documentation/blockdev/drbd/data-structure-v9.txt

0 → 100644
+38 −0
Original line number Diff line number Diff line 
This describes the in kernel data structure for DRBD-9. Starting with

Linux v3.14 we are reorganizing DRBD to use this data structure.



Basic Data Structure

====================



A node has a number of DRBD resources.  Each such resource has a number of

devices (aka volumes) and connections to other nodes ("peer nodes"). Each DRBD

device is represented by a block device locally.



The DRBD objects are interconnected to form a matrix as depicted below; a

drbd_peer_device object sits at each intersection between a drbd_device and a

drbd_connection:



  /--------------+---------------+.....+---------------\

  |   resource   |    device     |     |    device     |

  +--------------+---------------+.....+---------------+

  |  connection  |  peer_device  |     |  peer_device  |

  +--------------+---------------+.....+---------------+

  :              :               :     :               :

  :              :               :     :               :

  +--------------+---------------+.....+---------------+

  |  connection  |  peer_device  |     |  peer_device  |

  \--------------+---------------+.....+---------------/



In this table, horizontally, devices can be accessed from resources by their

volume number.  Likewise, peer_devices can be accessed from connections by

their volume number.  Objects in the vertical direction are connected by double

linked lists.  There are back pointers from peer_devices to their connections a

devices, and from connections and devices to their resource.



All resources are in the drbd_resources double-linked list.  In addition, all

devices can be accessed by their minor device number via the drbd_devices idr.



The drbd_resource, drbd_connection, and drbd_device objects are reference

counted.  The peer_device objects only serve to establish the links between

devices and connections; their lifetime is determined by the lifetime of the

device and connection which they reference.

drivers/block/DAC960.c

+16 −18
Original line number Diff line number Diff line
@@ -6411,11 +6411,11 @@ static bool DAC960_V2_ExecuteUserCommand(DAC960_Controller_T *Controller, 
					.ScatterGatherSegments[0]

					.SegmentByteCount =

	    CommandMailbox->ControllerInfo.DataTransferSize;

	  while (1) {

	    DAC960_ExecuteCommand(Command);

	  while (Controller->V2.NewControllerInformation->PhysicalScanActive)

	    {

	      DAC960_ExecuteCommand(Command);

	      sleep_on_timeout(&Controller->CommandWaitQueue, HZ);

	    if (!Controller->V2.NewControllerInformation->PhysicalScanActive)

		break;

	    msleep(1000);

	  }

	  DAC960_UserCritical("Discovery Completed\n", Controller);

 	}
@@ -7035,18 +7035,16 @@ static long DAC960_gam_ioctl(struct file *file, unsigned int Request, 
		ErrorCode = -EFAULT;

		break;

	}

	while (Controller->V2.HealthStatusBuffer->StatusChangeCounter

	ErrorCode = wait_event_interruptible_timeout(Controller->HealthStatusWaitQueue,

			!(Controller->V2.HealthStatusBuffer->StatusChangeCounter

			    == HealthStatusBuffer.StatusChangeCounter &&

			  Controller->V2.HealthStatusBuffer->NextEventSequenceNumber

	       == HealthStatusBuffer.NextEventSequenceNumber)

	  {

	    interruptible_sleep_on_timeout(&Controller->HealthStatusWaitQueue,

			    == HealthStatusBuffer.NextEventSequenceNumber),

			DAC960_MonitoringTimerInterval);

	    if (signal_pending(current)) {

	if (ErrorCode == -ERESTARTSYS) {

		ErrorCode = -EINTR;

		break;

	}

	  }

	if (copy_to_user(GetHealthStatus.HealthStatusBuffer,

			 Controller->V2.HealthStatusBuffer,

			 sizeof(DAC960_V2_HealthStatusBuffer_T)))

drivers/block/ataflop.c

+8 −8
Original line number Diff line number Diff line
@@ -68,6 +68,8 @@ 
#include <linux/init.h>

#include <linux/blkdev.h>

#include <linux/mutex.h>

#include <linux/completion.h>

#include <linux/wait.h>



#include <asm/atafd.h>

#include <asm/atafdreg.h>
@@ -301,7 +303,7 @@ module_param_array(UserSteprate, int, NULL, 0); 
/* Synchronization of FDC access. */

static volatile int fdc_busy = 0;

static DECLARE_WAIT_QUEUE_HEAD(fdc_wait);

static DECLARE_WAIT_QUEUE_HEAD(format_wait);

static DECLARE_COMPLETION(format_wait);



static unsigned long changed_floppies = 0xff, fake_change = 0;

#define	CHECK_CHANGE_DELAY	HZ/2
@@ -608,7 +610,7 @@ static void fd_error( void ) 
	if (IsFormatting) {

		IsFormatting = 0;

		FormatError = 1;

		wake_up( &format_wait );

		complete(&format_wait);

		return;

	}
@@ -650,9 +652,8 @@ static int do_format(int drive, int type, struct atari_format_descr *desc) 
	DPRINT(("do_format( dr=%d tr=%d he=%d offs=%d )\n",

		drive, desc->track, desc->head, desc->sect_offset ));



	wait_event(fdc_wait, cmpxchg(&fdc_busy, 0, 1) == 0);

	local_irq_save(flags);

	while( fdc_busy ) sleep_on( &fdc_wait );

	fdc_busy = 1;

	stdma_lock(floppy_irq, NULL);

	atari_turnon_irq( IRQ_MFP_FDC ); /* should be already, just to be sure */

	local_irq_restore(flags);
@@ -706,7 +707,7 @@ static int do_format(int drive, int type, struct atari_format_descr *desc) 
	ReqSide  = desc->head;

	do_fd_action( drive );



	sleep_on( &format_wait );

	wait_for_completion(&format_wait);



	redo_fd_request();

	return( FormatError ? -EIO : 0 );
@@ -1229,7 +1230,7 @@ static void fd_writetrack_done( int status ) 
		goto err_end;

	}



	wake_up( &format_wait );

	complete(&format_wait);

	return;



  err_end:
@@ -1497,8 +1498,7 @@ repeat: 
void do_fd_request(struct request_queue * q)

{

	DPRINT(("do_fd_request for pid %d\n",current->pid));

	while( fdc_busy ) sleep_on( &fdc_wait );

	fdc_busy = 1;

	wait_event(fdc_wait, cmpxchg(&fdc_busy, 0, 1) == 0);

	stdma_lock(floppy_irq, NULL);



	atari_disable_irq( IRQ_MFP_FDC );

drivers/block/cciss.c

+0 −2
Original line number Diff line number Diff line
@@ -4092,11 +4092,9 @@ static void cciss_interrupt_mode(ctlr_info_t *h) 
		if (err > 0) {

			dev_warn(&h->pdev->dev,

				"only %d MSI-X vectors available\n", err);

			goto default_int_mode;

		} else {

			dev_warn(&h->pdev->dev,

				"MSI-X init failed %d\n", err);

			goto default_int_mode;

		}

	}

	if (pci_find_capability(h->pdev, PCI_CAP_ID_MSI)) {

drivers/block/drbd/drbd_actlog.c

+317 −312

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE