projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
[firefly-linux-kernel-4.4.55.git]
/
fs
/
ocfs2
/
locks.c
diff --git
a/fs/ocfs2/locks.c
b/fs/ocfs2/locks.c
index b5cb3ede9408944d99abc7c7c3b28c01b1ddadeb..e57c804069ea6487c0a8eba6d203f88ccd8dd39a 100644
(file)
--- a/
fs/ocfs2/locks.c
+++ b/
fs/ocfs2/locks.c
@@
-26,7
+26,6
@@
#include <linux/fs.h>
#include <linux/fcntl.h>
-#define MLOG_MASK_PREFIX ML_INODE
#include <cluster/masklog.h>
#include "ocfs2.h"