Merge branch 'for-2.6.39' of git://linux-nfs.org/~bfields/linux
* 'for-2.6.39' of git://linux-nfs.org/~bfields/linux: SUNRPC: Remove resource leak in svc_rdma_send_error() nfsd: wrong index used in inner loop nfsd4: fix comment and remove unused nfsd4_file fields nfs41: make sure nfs server return right ca_maxresponsesize_cached nfsd: fix compile error svcrpc: fix bad argument in unix_domain_find nfsd4: fix struct file leak nfsd4: minor nfs4state.c reshuffling svcrpc: fix rare race on unix_domain creation nfsd41: modify the members value of nfsd4_op_flags nfsd: add proc file listing kernel's gss_krb5 enctypes gss:krb5 only include enctype numbers in gm_upcall_enctypes NFSD, VFS: Remove dead code in nfsd_rename() nfsd: kill unused macro definition locks: use assign_type()
This commit is contained in:
@@ -38,6 +38,14 @@ struct unix_domain {
|
||||
|
||||
extern struct auth_ops svcauth_unix;
|
||||
|
||||
static void svcauth_unix_domain_release(struct auth_domain *dom)
|
||||
{
|
||||
struct unix_domain *ud = container_of(dom, struct unix_domain, h);
|
||||
|
||||
kfree(dom->name);
|
||||
kfree(ud);
|
||||
}
|
||||
|
||||
struct auth_domain *unix_domain_find(char *name)
|
||||
{
|
||||
struct auth_domain *rv;
|
||||
@@ -47,7 +55,7 @@ struct auth_domain *unix_domain_find(char *name)
|
||||
while(1) {
|
||||
if (rv) {
|
||||
if (new && rv != &new->h)
|
||||
auth_domain_put(&new->h);
|
||||
svcauth_unix_domain_release(&new->h);
|
||||
|
||||
if (rv->flavour != &svcauth_unix) {
|
||||
auth_domain_put(rv);
|
||||
@@ -74,14 +82,6 @@ struct auth_domain *unix_domain_find(char *name)
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(unix_domain_find);
|
||||
|
||||
static void svcauth_unix_domain_release(struct auth_domain *dom)
|
||||
{
|
||||
struct unix_domain *ud = container_of(dom, struct unix_domain, h);
|
||||
|
||||
kfree(dom->name);
|
||||
kfree(ud);
|
||||
}
|
||||
|
||||
|
||||
/**************************************************
|
||||
* cache for IP address to unix_domain
|
||||
|
Verwijs in nieuw issue
Block a user