Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 970b0648 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block 

* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
  coda: move backing-dev.h kernel include inside __KERNEL__
  mtd: ensure that bdi entries are properly initialized and registered
  Move mtd_bdi_*mappable to mtdcore.c
  btrfs: convert to using bdi_setup_and_register()
  Catch filesystems lacking s_bdi
  drbd: Terminate a connection early if sending the protocol fails
  drbd: fix memory leak
  Fix JFFS2 sync silent failure
  smbfs: add bdi backing to mount session
  ncpfs: add bdi backing to mount session
  exofs: add bdi backing to mount session
  ecryptfs: add bdi backing to mount session
  coda: add bdi backing to mount session
  cifs: add bdi backing to mount session
  afs: add bdi backing to mount session.
  9p: add bdi backing to mount session
  bdi: add helper function for doing init and register of a bdi for a file system
  block: ensure jiffies wrap is handled correctly in blk_rq_timed_out_timer
parents 696e65c3 33f60e96

block/blk-timeout.c

+5 −7
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ void blk_rq_timed_out_timer(unsigned long data) 
	struct request_queue *q = (struct request_queue *) data;

	unsigned long flags, next = 0;

	struct request *rq, *tmp;

	int next_set = 0;



	spin_lock_irqsave(q->queue_lock, flags);
@@ -122,16 +123,13 @@ void blk_rq_timed_out_timer(unsigned long data) 
			if (blk_mark_rq_complete(rq))

				continue;

			blk_rq_timed_out(rq);

		} else if (!next || time_after(next, rq->deadline))

		} else if (!next_set || time_after(next, rq->deadline)) {

			next = rq->deadline;

			next_set = 1;

		}

	}



	/*

	 * next can never be 0 here with the list non-empty, since we always

	 * bump ->deadline to 1 so we can detect if the timer was ever added

	 * or not. See comment in blk_add_timer()

	 */

	if (next)

	if (next_set)

		mod_timer(&q->timeout, round_jiffies_up(next));



	spin_unlock_irqrestore(q->queue_lock, flags);

drivers/block/drbd/drbd_main.c

+1 −0
Original line number Diff line number Diff line
@@ -1695,6 +1695,7 @@ int drbd_send_protocol(struct drbd_conf *mdev) 
			cf |= CF_DRY_RUN;

		else {

			dev_err(DEV, "--dry-run is not supported by peer");

			kfree(p);

			return 0;

		}

	}

drivers/block/drbd/drbd_receiver.c

+2 −1
Original line number Diff line number Diff line
@@ -899,7 +899,8 @@ static int drbd_connect(struct drbd_conf *mdev) 


	drbd_thread_start(&mdev->asender);



	drbd_send_protocol(mdev);

	if (!drbd_send_protocol(mdev))

		return -1;

	drbd_send_sync_param(mdev, &mdev->sync_conf);

	drbd_send_sizes(mdev, 0);

	drbd_send_uuids(mdev);

drivers/mtd/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 


# Core functionality.

obj-$(CONFIG_MTD)		+= mtd.o

mtd-y				:= mtdcore.o mtdsuper.o mtdbdi.o

mtd-y				:= mtdcore.o mtdsuper.o

mtd-$(CONFIG_MTD_PARTITIONS)	+= mtdpart.o



obj-$(CONFIG_MTD_CONCAT)	+= mtdconcat.o

drivers/mtd/internal.h

+0 −17
Original line number Diff line number Diff line 
/* Internal MTD definitions

 *

 * Copyright © 2006 Red Hat, Inc. All Rights Reserved.

 * Written by David Howells (dhowells@redhat.com)

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License

 * as published by the Free Software Foundation; either version

 * 2 of the License, or (at your option) any later version.

 */



/*

 * mtdbdi.c

 */

extern struct backing_dev_info mtd_bdi_unmappable;

extern struct backing_dev_info mtd_bdi_ro_mappable;

extern struct backing_dev_info mtd_bdi_rw_mappable;