lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

NFSD: Refactor portlist socket closing into a helper

Browse Source 
Clean up: Refactor the socket closing logic out of __write_ports() to
make it easier to understand and maintain.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
This commit is contained in:
Chuck Lever
2009-04-23 19:31:48 -04:00
committed by J. Bruce Fields
parent 4eb68c266c
commit 82d565919a
1 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
fs/nfsd/nfsctl.c
View File

@@ -910,6 +910,27 @@ static ssize_t write_versions(struct file *file, char *buf, size_t size)
return rv; return rv;
} }
/*
* A '-' followed by the 'name' of a socket means we close the socket.
*/
static ssize_t __write_ports_delfd(char *buf)
{
char *toclose;
int len = 0;
toclose = kstrdup(buf + 1, GFP_KERNEL);
if (toclose == NULL)
return -ENOMEM;
if (nfsd_serv != NULL)
len = svc_sock_names(buf, nfsd_serv, toclose);
if (len >= 0)
lockd_down();
kfree(toclose);
return len;
}
/* /*
* A transport listener is added by writing it's transport name and * A transport listener is added by writing it's transport name and
* a port number. * a port number.
@@ -1004,18 +1025,9 @@ static ssize_t __write_ports(struct file *file, char *buf, size_t size)
} }
return err < 0 ? err : 0; return err < 0 ? err : 0;
} }
if (buf[0] == '-' && isdigit(buf[1])) {
char *toclose = kstrdup(buf+1, GFP_KERNEL); if (buf[0] == '-' && isdigit(buf[1]))
int len = 0; return __write_ports_delfd(buf);
if (!toclose)
return -ENOMEM;
if (nfsd_serv)
len = svc_sock_names(buf, nfsd_serv, toclose);
if (len >= 0)
lockd_down();
kfree(toclose);
return len;
}
if (isalpha(buf[0])) if (isalpha(buf[0]))
return __write_ports_addxprt(buf); return __write_ports_addxprt(buf);