diff options
author | 2009-12-26 14:52:54 +0000 | |
---|---|---|
committer | 2009-12-26 14:52:54 +0000 | |
commit | 7f50548abb5454bd82c25aae15f0a3bf6a530f46 (patch) | |
tree | 175b5d695437151f0f9f778ad8eb7f274468842f /fs/nfs/dns_resolve.c | |
parent | ASoC: fix params_rate() macro use in several codecs (diff) | |
parent | Linux 2.6.33-rc2 (diff) | |
download | wireguard-linux-7f50548abb5454bd82c25aae15f0a3bf6a530f46.tar.xz wireguard-linux-7f50548abb5454bd82c25aae15f0a3bf6a530f46.zip |
Merge commit 'v2.6.33-rc2' into for-2.6.33
Diffstat (limited to 'fs/nfs/dns_resolve.c')
-rw-r--r-- | fs/nfs/dns_resolve.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfs/dns_resolve.c b/fs/nfs/dns_resolve.c index f4d54ba97cc6..95e1ca765d47 100644 --- a/fs/nfs/dns_resolve.c +++ b/fs/nfs/dns_resolve.c @@ -146,7 +146,7 @@ static int nfs_dns_show(struct seq_file *m, struct cache_detail *cd, return 0; } -struct nfs_dns_ent *nfs_dns_lookup(struct cache_detail *cd, +static struct nfs_dns_ent *nfs_dns_lookup(struct cache_detail *cd, struct nfs_dns_ent *key) { struct cache_head *ch; @@ -159,7 +159,7 @@ struct nfs_dns_ent *nfs_dns_lookup(struct cache_detail *cd, return container_of(ch, struct nfs_dns_ent, h); } -struct nfs_dns_ent *nfs_dns_update(struct cache_detail *cd, +static struct nfs_dns_ent *nfs_dns_update(struct cache_detail *cd, struct nfs_dns_ent *new, struct nfs_dns_ent *key) { |