diff options
author | Anton Altaparmakov <aia21@cantab.net> | 2005-05-21 17:00:02 -0400 |
---|---|---|
committer | Anton Altaparmakov <aia21@cantab.net> | 2005-05-21 17:00:02 -0400 |
commit | 67394f8f069c2fdf90f3b6d851824c07815442af (patch) | |
tree | 0c33e62d34dbaecea434ae9ece3cc0c56db8b1f7 /fs/nfs/idmap.c | |
parent | 450cbfbbbd88876e3ccec1d277f613221ca82bb7 (diff) | |
parent | 9636273dae265b9354b861b373cd43cd76a6d0fe (diff) |
Merge with /usr/src/ntfs-2.6.git
Diffstat (limited to 'fs/nfs/idmap.c')
-rw-r--r-- | fs/nfs/idmap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfs/idmap.c b/fs/nfs/idmap.c index b74c4e3a64e2..87f4f9aeac86 100644 --- a/fs/nfs/idmap.c +++ b/fs/nfs/idmap.c | |||
@@ -79,7 +79,7 @@ static ssize_t idmap_pipe_upcall(struct file *, struct rpc_pipe_msg *, | |||
79 | char __user *, size_t); | 79 | char __user *, size_t); |
80 | static ssize_t idmap_pipe_downcall(struct file *, const char __user *, | 80 | static ssize_t idmap_pipe_downcall(struct file *, const char __user *, |
81 | size_t); | 81 | size_t); |
82 | void idmap_pipe_destroy_msg(struct rpc_pipe_msg *); | 82 | static void idmap_pipe_destroy_msg(struct rpc_pipe_msg *); |
83 | 83 | ||
84 | static unsigned int fnvhash32(const void *, size_t); | 84 | static unsigned int fnvhash32(const void *, size_t); |
85 | 85 | ||
@@ -434,7 +434,7 @@ out: | |||
434 | return ret; | 434 | return ret; |
435 | } | 435 | } |
436 | 436 | ||
437 | void | 437 | static void |
438 | idmap_pipe_destroy_msg(struct rpc_pipe_msg *msg) | 438 | idmap_pipe_destroy_msg(struct rpc_pipe_msg *msg) |
439 | { | 439 | { |
440 | struct idmap_msg *im = msg->data; | 440 | struct idmap_msg *im = msg->data; |