diff options
| author | Arjan van de Ven <arjan@linux.intel.com> | 2008-10-17 12:20:26 -0400 |
|---|---|---|
| committer | Arjan van de Ven <arjan@linux.intel.com> | 2008-10-17 12:20:26 -0400 |
| commit | 651dab4264e4ba0e563f5ff56f748127246e9065 (patch) | |
| tree | 016630974bdcb00fe529b673f96d389e0fd6dc94 /fs/ocfs2/cluster/masklog.c | |
| parent | 40b8606253552109815786e5d4b0de98782d31f5 (diff) | |
| parent | 2e532d68a2b3e2aa6b19731501222069735c741c (diff) | |
Merge commit 'linus/master' into merge-linus
Conflicts:
arch/x86/kvm/i8254.c
Diffstat (limited to 'fs/ocfs2/cluster/masklog.c')
| -rw-r--r-- | fs/ocfs2/cluster/masklog.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/ocfs2/cluster/masklog.c b/fs/ocfs2/cluster/masklog.c index 23c732f27529..d8a0cb92cef6 100644 --- a/fs/ocfs2/cluster/masklog.c +++ b/fs/ocfs2/cluster/masklog.c | |||
| @@ -109,6 +109,7 @@ static struct mlog_attribute mlog_attrs[MLOG_MAX_BITS] = { | |||
| 109 | define_mask(CONN), | 109 | define_mask(CONN), |
| 110 | define_mask(QUORUM), | 110 | define_mask(QUORUM), |
| 111 | define_mask(EXPORT), | 111 | define_mask(EXPORT), |
| 112 | define_mask(XATTR), | ||
| 112 | define_mask(ERROR), | 113 | define_mask(ERROR), |
| 113 | define_mask(NOTICE), | 114 | define_mask(NOTICE), |
| 114 | define_mask(KTHREAD), | 115 | define_mask(KTHREAD), |