diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2006-12-13 00:35:10 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-13 09:05:53 -0800 |
commit | a71113da44063b587b5a4c2fc94c948a14f2bb43 (patch) | |
tree | c2b804232dcda3e403d43977e7329c21e787e242 /fs/smbfs/smbiod.c | |
parent | 3cec556a84be02bcd8755422eec61f1b9bee4e2f (diff) | |
download | blackbird-op-linux-a71113da44063b587b5a4c2fc94c948a14f2bb43.tar.gz blackbird-op-linux-a71113da44063b587b5a4c2fc94c948a14f2bb43.zip |
[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>
Diffstat (limited to 'fs/smbfs/smbiod.c')
-rw-r--r-- | fs/smbfs/smbiod.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/smbfs/smbiod.c b/fs/smbfs/smbiod.c index e67540441288..89eaf31f1d46 100644 --- a/fs/smbfs/smbiod.c +++ b/fs/smbfs/smbiod.c @@ -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; } |