diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2006-11-08 03:19:38 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-12-03 00:21:09 -0500 |
commit | 5a874db4d9bfd8a4c6324d844a4d1c7cfa5cf2c4 (patch) | |
tree | 7e3451c3931a8c4124ca040a86e20fe8ba8c71aa /include | |
parent | 3e6c8cd5669c1202fe806ce3e13d701f20a71c7e (diff) |
[NET]: ipconfig and nfsroot annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/nfs_fs.h | 2 | ||||
-rw-r--r-- | include/net/ipconfig.h | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h index 45228c1a1195..625ffea98561 100644 --- a/include/linux/nfs_fs.h +++ b/include/linux/nfs_fs.h | |||
@@ -318,7 +318,7 @@ extern void put_nfs_open_context(struct nfs_open_context *ctx); | |||
318 | extern struct nfs_open_context *nfs_find_open_context(struct inode *inode, struct rpc_cred *cred, int mode); | 318 | extern struct nfs_open_context *nfs_find_open_context(struct inode *inode, struct rpc_cred *cred, int mode); |
319 | 319 | ||
320 | /* linux/net/ipv4/ipconfig.c: trims ip addr off front of name, too. */ | 320 | /* linux/net/ipv4/ipconfig.c: trims ip addr off front of name, too. */ |
321 | extern u32 root_nfs_parse_addr(char *name); /*__init*/ | 321 | extern __be32 root_nfs_parse_addr(char *name); /*__init*/ |
322 | 322 | ||
323 | static inline void nfs_fattr_init(struct nfs_fattr *fattr) | 323 | static inline void nfs_fattr_init(struct nfs_fattr *fattr) |
324 | { | 324 | { |
diff --git a/include/net/ipconfig.h b/include/net/ipconfig.h index 2a1fe996fbc6..3924d7d2cb11 100644 --- a/include/net/ipconfig.h +++ b/include/net/ipconfig.h | |||
@@ -11,12 +11,12 @@ | |||
11 | extern int ic_proto_enabled; /* Protocols enabled (see IC_xxx) */ | 11 | extern int ic_proto_enabled; /* Protocols enabled (see IC_xxx) */ |
12 | extern int ic_set_manually; /* IPconfig parameters set manually */ | 12 | extern int ic_set_manually; /* IPconfig parameters set manually */ |
13 | 13 | ||
14 | extern u32 ic_myaddr; /* My IP address */ | 14 | extern __be32 ic_myaddr; /* My IP address */ |
15 | extern u32 ic_gateway; /* Gateway IP address */ | 15 | extern __be32 ic_gateway; /* Gateway IP address */ |
16 | 16 | ||
17 | extern u32 ic_servaddr; /* Boot server IP address */ | 17 | extern __be32 ic_servaddr; /* Boot server IP address */ |
18 | 18 | ||
19 | extern u32 root_server_addr; /* Address of NFS server */ | 19 | extern __be32 root_server_addr; /* Address of NFS server */ |
20 | extern u8 root_server_path[]; /* Path to mount as root */ | 20 | extern u8 root_server_path[]; /* Path to mount as root */ |
21 | 21 | ||
22 | 22 | ||