git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux...
[pandora-kernel.git]
/
fs
/
ocfs2
/
locks.h
diff --git
a/fs/ocfs2/locks.h
b/fs/ocfs2/locks.h
index
9743ef2
..
496d488
100644
(file)
--- a/
fs/ocfs2/locks.h
+++ b/
fs/ocfs2/locks.h
@@
-27,5
+27,6
@@
#define OCFS2_LOCKS_H
int ocfs2_flock(struct file *file, int cmd, struct file_lock *fl);
#define OCFS2_LOCKS_H
int ocfs2_flock(struct file *file, int cmd, struct file_lock *fl);
+int ocfs2_lock(struct file *file, int cmd, struct file_lock *fl);
#endif /* OCFS2_LOCKS_H */
#endif /* OCFS2_LOCKS_H */