Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq

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

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