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 'mount.part1' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
[linux-2.6-block.git]
/
fs
/
nfs
/
internal.h
diff --git
a/fs/nfs/internal.h
b/fs/nfs/internal.h
index 7f80f036ebd9948f62fd46bea5afe3ee319920d3..b1e577302518f404e9914f1f1d9f539b1e30194c 100644
(file)
--- a/
fs/nfs/internal.h
+++ b/
fs/nfs/internal.h
@@
-123,7
+123,7
@@
struct nfs_parsed_mount_data {
unsigned short protocol;
} nfs_server;
-
struct security_mnt_opts
lsm_opts;
+
void *
lsm_opts;
struct net *net;
};