Merge branch 'server-cluster-locking-api' of git://linux-nfs.org/~bfields/linux

[linux-2.6] / fs / gfs2 / recovery.c

diff --git a/fs/gfs2/recovery.c b/fs/gfs2/recovery.c
index 4acf238e1db60de6488f364dbaf5eed46c04de2c..8bc182c7e2ef22c2bad269743f15bab5f27a4914 100644 (file)
--- a/fs/gfs2/recovery.c
+++ b/fs/gfs2/recovery.c
@@ -7,7 +7,6 @@
  * of the GNU General Public License version 2.
  */
 
-#include <linux/sched.h>
 #include <linux/slab.h>
 #include <linux/spinlock.h>
 #include <linux/completion.h>
@@ -136,7 +135,7 @@ static int get_log_header(struct gfs2_jdesc *jd, unsigned int blk,
 {
        struct buffer_head *bh;
        struct gfs2_log_header_host lh;
-static const u32 nothing = 0;
+       const u32 nothing = 0;
        u32 hash;
        int error;