projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
fs
/
ocfs2
/
locks.c
diff --git
a/fs/ocfs2/locks.c
b/fs/ocfs2/locks.c
index
b5cb3ed
..
e57c804
100644
(file)
--- a/
fs/ocfs2/locks.c
+++ b/
fs/ocfs2/locks.c
@@
-26,7
+26,6
@@
#include <linux/fs.h>
#include <linux/fcntl.h>
#include <linux/fs.h>
#include <linux/fcntl.h>
-#define MLOG_MASK_PREFIX ML_INODE
#include <cluster/masklog.h>
#include "ocfs2.h"
#include <cluster/masklog.h>
#include "ocfs2.h"