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/inode.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/inode.c')
| -rw-r--r-- | fs/smbfs/inode.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/smbfs/inode.c b/fs/smbfs/inode.c index 4af4cd729a5a..84dfe3f3482e 100644 --- a/fs/smbfs/inode.c +++ b/fs/smbfs/inode.c @@ -482,12 +482,13 @@ smb_put_super(struct super_block *sb) smb_close_socket(server); if (server->conn_pid) - kill_proc(server->conn_pid, SIGTERM, 1); + kill_pid(server->conn_pid, SIGTERM, 1); kfree(server->ops); smb_unload_nls(server); sb->s_fs_info = NULL; smb_unlock_server(server); + put_pid(server->conn_pid); kfree(server); } @@ -530,7 +531,7 @@ static int smb_fill_super(struct super_block *sb, void *raw_data, int silent) INIT_LIST_HEAD(&server->xmitq); INIT_LIST_HEAD(&server->recvq); server->conn_error = 0; - server->conn_pid = 0; + server->conn_pid = NULL; server->state = CONN_INVALID; /* no connection yet */ server->generation = 0; |
