Merge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze

[sfrench/cifs-2.6.git] / fs / gfs2 / incore.h

diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h
index b5d7363b22da08cdbcaab0c3f5188022c5f7bffe..8fcbce48a128af6414b98afe7f3d48f83dd84ef8 100644 (file)
--- a/fs/gfs2/incore.h
+++ b/fs/gfs2/incore.h
@@ -460,6 +460,7 @@ enum {
        SDF_NOBARRIERS          = 3,
        SDF_NORECOVERY          = 4,
        SDF_DEMOTE              = 5,
+       SDF_NOJOURNALID         = 6,
 };
 
 #define GFS2_FSNAME_LEN                256