projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec...
[linux-2.6-block.git]
/
fs
/
ocfs2
/
ioctl.c
diff --git
a/fs/ocfs2/ioctl.c
b/fs/ocfs2/ioctl.c
index a68d0e4ca6dc17ed10d339ad6c33f7663ba34126..31fbb061951035d3211e1041e5b39bb6ed8d6db9 100644
(file)
--- a/
fs/ocfs2/ioctl.c
+++ b/
fs/ocfs2/ioctl.c
@@
-7,7
+7,6
@@
#include <linux/fs.h>
#include <linux/mount.h>
-#include <linux/smp_lock.h>
#define MLOG_MASK_PREFIX ML_INODE
#include <cluster/masklog.h>