diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-06-15 17:06:48 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-06-15 17:06:48 -0400 |
| commit | f2cbb4f01936a3e4225692e03b084b78c56d386d (patch) | |
| tree | f89f3d8baa250589a38a4dd2df56f84cddae3c76 /fs/nfs/idmap.c | |
| parent | 325a479c4c110db278ef3361460a48c4093252cc (diff) | |
| parent | 1016888fb69662936b32ab767c7419a3be9a69d3 (diff) | |
Auto merge with /home/aegl/GIT/linus
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; |