projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
[powerpc.git]
/
fs
/
smbfs
/
proc.c
diff --git
a/fs/smbfs/proc.c
b/fs/smbfs/proc.c
index
a5ced9e
..
feac460
100644
(file)
--- a/
fs/smbfs/proc.c
+++ b/
fs/smbfs/proc.c
@@
-877,7
+877,7
@@
smb_newconn(struct smb_sb_info *server, struct smb_conn_opt *opt)
goto out_putf;
server->sock_file = filp;
goto out_putf;
server->sock_file = filp;
- server->conn_pid =
current->pid
;
+ server->conn_pid =
get_pid(task_pid(current))
;
server->opt = *opt;
server->generation += 1;
server->state = CONN_VALID;
server->opt = *opt;
server->generation += 1;
server->state = CONN_VALID;
@@
-971,8
+971,8
@@
smb_newconn(struct smb_sb_info *server, struct smb_conn_opt *opt)
}
VERBOSE("protocol=%d, max_xmit=%d, pid=%d capabilities=0x%x\n",
}
VERBOSE("protocol=%d, max_xmit=%d, pid=%d capabilities=0x%x\n",
- server->opt.protocol, server->opt.max_xmit,
server->conn_pid,
- server->opt.capabilities);
+ server->opt.protocol, server->opt.max_xmit,
+
pid_nr(server->conn_pid),
server->opt.capabilities);
/* FIXME: this really should be done by smbmount. */
if (server->opt.max_xmit > SMB_MAX_PACKET_SIZE) {
/* FIXME: this really should be done by smbmount. */
if (server->opt.max_xmit > SMB_MAX_PACKET_SIZE) {