From: Sage Weil <sage@newdream.net>
Date: Thu, 3 Apr 2008 17:55:26 +0000 (-0700)
Subject: Merge branch 'unstable' into io
X-Git-Tag: v0.2~212
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=25da72b55f08c8aa730387cbb92c6546da0474e9;p=ceph.git

Merge branch 'unstable' into io
---

25da72b55f08c8aa730387cbb92c6546da0474e9
diff --cc src/kernel/addr.c
index 4297adaa9ab2,80abf6ed0cf2..33754cf06222
--- a/src/kernel/addr.c
+++ b/src/kernel/addr.c
@@@ -3,9 -3,8 +3,9 @@@
  #include <linux/mm.h>
  #include <linux/pagemap.h>
  #include <linux/writeback.h>	/* generic_writepages */
 +#include <linux/pagevec.h>
  
- int ceph_debug_addr = 50;
+ int ceph_debug_addr = -1;
  #define DOUT_VAR ceph_debug_addr
  #define DOUT_PREFIX "addr: "
  #include "super.h"