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 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
[sfrench/cifs-2.6.git]
/
fs
/
internal.h
diff --git
a/fs/internal.h
b/fs/internal.h
index e38c08ca437dcdeed706b1cb0d043fd99d53600c..b71deeecea17939d85bce1c54f30da77f1c4d8a1 100644
(file)
--- a/
fs/internal.h
+++ b/
fs/internal.h
@@
-55,7
+55,7
@@
extern int vfs_path_lookup(struct dentry *, struct vfsmount *,
/*
* namespace.c
*/
-extern
int copy_mount_options(const void __user *, unsigned long
*);
+extern
void *copy_mount_options(const void __user
*);
extern char *copy_mount_string(const void __user *);
extern struct vfsmount *lookup_mnt(struct path *);