git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszer...
[sfrench/cifs-2.6.git]
/
include
/
linux
/
fs.h
diff --git
a/include/linux/fs.h
b/include/linux/fs.h
index 2d0e6748e46e1f6707b0de2b127cf5ee59553c3c..33d8e45cd874b7b25d9fc570b26c6df4dfea83e2 100644
(file)
--- a/
include/linux/fs.h
+++ b/
include/linux/fs.h
@@
-1235,7
+1235,7
@@
static inline struct inode *file_inode(const struct file *f)
static inline struct dentry *file_dentry(const struct file *file)
{
static inline struct dentry *file_dentry(const struct file *file)
{
- return d_real(file->f_path.dentry, file_inode(file), 0);
+ return d_real(file->f_path.dentry, file_inode(file), 0
, 0
);
}
static inline int locks_lock_file_wait(struct file *filp, struct file_lock *fl)
}
static inline int locks_lock_file_wait(struct file *filp, struct file_lock *fl)