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

* 'for-2.6.35' of git://git.kernel.dk/linux-2.6-block: (86 commits)
  pipe: set lower and upper limit on max pages in the pipe page array
  pipe: add support for shrinking and growing pipes
  drbd: This is now equivalent to drbd release 8.3.8rc1
  drbd: Do not free p_uuid early, this is done in the exit code of the receiver
  drbd: Null pointer deref fix to the large "multi bio rewrite"
  drbd: Fix: Do not detach, if a bio with a barrier fails
  drbd: Ensure to not trigger late-new-UUID creation multiple times
  drbd: Do not Oops when C_STANDALONE when uuid gets generated
  writeback: fix mixed up arguments to bdi_start_writeback()
  writeback: fix problem with !CONFIG_BLOCK compilation
  block: improve automatic native capacity unlocking
  block: use struct parsed_partitions *state universally in partition check code
  block,ide: simplify bdops->set_capacity() to ->unlock_native_capacity()
  block: restart partition scan after resizing a device
  buffer: make invalidate_bdev() drain all percpu LRU add caches
  block: remove all rcu head initializations
  writeback: fixups for !dirty_writeback_centisecs
  writeback: bdi_writeback_task() must set task state before calling schedule()
  writeback: ensure that WB_SYNC_NONE writeback with sb pinned is sync
  drivers/block/drbd: Use kzalloc
  ...

diff --combined kernel/sysctl.c
index 30acc6c87b1b4074e8a8d6f0fce2c6361361fb5f,18821e77b2a0c3bbced8e2a3d83d3b8c2293c7da..4c93486b45d1285dc82d65b027cf308dd14c87ff
--- 1/kernel/sysctl.c
--- 2/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@@ -52,6 -52,7 +52,7 @@@
  #include <linux/slow-work.h>
  #include <linux/perf_event.h>
  #include <linux/kprobes.h>
+ #include <linux/pipe_fs_i.h>
  
  #include <asm/uaccess.h>
  #include <asm/processor.h>
@@@ -1444,6 -1445,14 +1445,14 @@@ static struct ctl_table fs_table[] = 
                .child          = binfmt_misc_table,
        },
  #endif
+       {
+               .procname       = "pipe-max-pages",
+               .data           = &pipe_max_pages,
+               .maxlen         = sizeof(int),
+               .mode           = 0644,
+               .proc_handler   = &proc_dointvec_minmax,
+               .extra1         = &two,
+       },
  /*
   * NOTE: do not add new entries to this table unless you have read
   * Documentation/sysctl/ctl_unnumbered.txt
@@@ -2083,20 -2092,20 +2092,20 @@@ static void proc_skip_char(char **buf, 
  
  #define TMPBUFLEN 22
  /**
 - * proc_get_long - reads an ASCII formated integer from a user buffer
 + * proc_get_long - reads an ASCII formatted integer from a user buffer
   *
 - * @buf - a kernel buffer
 - * @size - size of the kernel buffer
 - * @val - this is where the number will be stored
 - * @neg - set to %TRUE if number is negative
 - * @perm_tr - a vector which contains the allowed trailers
 - * @perm_tr_len - size of the perm_tr vector
 - * @tr - pointer to store the trailer character
 + * @buf: a kernel buffer
 + * @size: size of the kernel buffer
 + * @val: this is where the number will be stored
 + * @neg: set to %TRUE if number is negative
 + * @perm_tr: a vector which contains the allowed trailers
 + * @perm_tr_len: size of the perm_tr vector
 + * @tr: pointer to store the trailer character
   *
 - * In case of success 0 is returned and buf and size are updated with
 - * the amount of bytes read. If tr is non NULL and a trailing
 - * character exist (size is non zero after returning from this
 - * function) tr is updated with the trailing character.
 + * In case of success %0 is returned and @buf and @size are updated with
 + * the amount of bytes read. If @tr is non-NULL and a trailing
 + * character exists (size is non-zero after returning from this
 + * function), @tr is updated with the trailing character.
   */
  static int proc_get_long(char **buf, size_t *size,
                          unsigned long *val, bool *neg,
@@@ -2147,15 -2156,15 +2156,15 @@@
  }
  
  /**
 - * proc_put_long - coverts an integer to a decimal ASCII formated string
 + * proc_put_long - converts an integer to a decimal ASCII formatted string
   *
 - * @buf - the user buffer
 - * @size - the size of the user buffer
 - * @val - the integer to be converted
 - * @neg - sign of the number, %TRUE for negative
 + * @buf: the user buffer
 + * @size: the size of the user buffer
 + * @val: the integer to be converted
 + * @neg: sign of the number, %TRUE for negative
   *
 - * In case of success 0 is returned and buf and size are updated with
 - * the amount of bytes read.
 + * In case of success %0 is returned and @buf and @size are updated with
 + * the amount of bytes written.
   */
  static int proc_put_long(void __user **buf, size_t *size, unsigned long val,
                          bool neg)