memcgroup: tidy up mem_cgroup_charge_common

[linux-2.6] / fs / nfs / internal.h

diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h
index 75793794aefe462469c372f19c072768214d31f3..0f5619611b8dc5d313accd81658fd6dd32e6a647 100644 (file)
--- a/fs/nfs/internal.h
+++ b/fs/nfs/internal.h
@@ -21,7 +21,8 @@ struct nfs_clone_mount {
        struct nfs_fattr *fattr;
        char *hostname;
        char *mnt_path;
-       struct sockaddr_in *addr;
+       struct sockaddr *addr;
+       size_t addrlen;
        rpc_authflavor_t authflavor;
 };
 
@@ -41,19 +42,19 @@ struct nfs_parsed_mount_data {
        char                    *client_address;
 
        struct {
-               struct sockaddr_in      address;
+               struct sockaddr_storage address;
+               size_t                  addrlen;
                char                    *hostname;
-               unsigned int            program;
                unsigned int            version;
                unsigned short          port;
                int                     protocol;
        } mount_server;
 
        struct {
-               struct sockaddr_in      address;
+               struct sockaddr_storage address;
+               size_t                  addrlen;
                char                    *hostname;
                char                    *export_path;
-               unsigned int            program;
                int                     protocol;
        } nfs_server;
 };
@@ -62,7 +63,8 @@ struct nfs_parsed_mount_data {
 extern struct rpc_program nfs_program;
 
 extern void nfs_put_client(struct nfs_client *);
-extern struct nfs_client *nfs_find_client(const struct sockaddr_in *, int);
+extern struct nfs_client *nfs_find_client(const struct sockaddr *, u32);
+extern struct nfs_client *nfs_find_client_next(struct nfs_client *);
 extern struct nfs_server *nfs_create_server(
                                        const struct nfs_parsed_mount_data *,
                                        struct nfs_fh *);