diff --git a/[refs] b/[refs] index d5e5674ecf17..6036561a7688 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 33c3de32872ef3c075e4dac04c0de8f86ac39f6f +refs/heads/master: 887bc5d00c02b32763845247024e8db5243ef857 diff --git a/trunk/fs/gfs2/recovery.c b/trunk/fs/gfs2/recovery.c index 4acf238e1db6..d0c806b85c86 100644 --- a/trunk/fs/gfs2/recovery.c +++ b/trunk/fs/gfs2/recovery.c @@ -136,7 +136,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;