[PATCH] smbfs: Make conn_pid a struct pid
smbfs keeps track of the user space server process in conn_pid. This converts that track to use a struct pid instead of pid_t. This keeps us safe from pid wrap around issues and prepares the way for the pid namespace. Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:

committed by
Linus Torvalds

parent
3cec556a84
commit
a71113da44
@@ -152,7 +152,7 @@ int smbiod_retry(struct smb_sb_info *server)
|
||||
{
|
||||
struct list_head *head;
|
||||
struct smb_request *req;
|
||||
pid_t pid = server->conn_pid;
|
||||
struct pid *pid = get_pid(server->conn_pid);
|
||||
int result = 0;
|
||||
|
||||
VERBOSE("state: %d\n", server->state);
|
||||
@@ -222,7 +222,7 @@ int smbiod_retry(struct smb_sb_info *server)
|
||||
/*
|
||||
* Note: use the "priv" flag, as a user process may need to reconnect.
|
||||
*/
|
||||
result = kill_proc(pid, SIGUSR1, 1);
|
||||
result = kill_pid(pid, SIGUSR1, 1);
|
||||
if (result) {
|
||||
/* FIXME: this is most likely fatal, umount? */
|
||||
printk(KERN_ERR "smb_retry: signal failed [%d]\n", result);
|
||||
@@ -233,6 +233,7 @@ int smbiod_retry(struct smb_sb_info *server)
|
||||
/* FIXME: The retried requests should perhaps get a "time boost". */
|
||||
|
||||
out:
|
||||
put_pid(pid);
|
||||
return result;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user