iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
linux/net
History
James Morris f3a5c54701 Merge branch 'master' into next 
Conflicts:
	fs/cifs/misc.c

Merge to resolve above, per the patch below.

Signed-off-by: James Morris <jmorris@namei.org>

diff --cc fs/cifs/misc.c
index ec36410,addd1dc..0000000
--- a/fs/cifs/misc.c
+++ b/fs/cifs/misc.c
@@@ -347,13 -338,13 +338,13 @@@ header_assemble(struct smb_hdr *buffer
  		/*  BB Add support for establishing new tCon and SMB Session  */
  		/*      with userid/password pairs found on the smb session   */
  		/*	for other target tcp/ip addresses 		BB    */
 -				if (current->fsuid != treeCon->ses->linux_uid) {
 +				if (current_fsuid() != treeCon->ses->linux_uid) {
  					cFYI(1, ("Multiuser mode and UID "
  						 "did not match tcon uid"));
- 					read_lock(&GlobalSMBSeslock);
- 					list_for_each(temp_item, &GlobalSMBSessionList) {
- 						ses = list_entry(temp_item, struct cifsSesInfo, cifsSessionList);
+ 					read_lock(&cifs_tcp_ses_lock);
+ 					list_for_each(temp_item, &treeCon->ses->server->smb_ses_list) {
+ 						ses = list_entry(temp_item, struct cifsSesInfo, smb_ses_list);
 -						if (ses->linux_uid == current->fsuid) {
 +						if (ses->linux_uid == current_fsuid()) {
  							if (ses->server == treeCon->ses->server) {
  								cFYI(1, ("found matching uid substitute right smb_uid"));
  								buffer->Uid = ses->Suid;
2008-11-18 18:52:37 +11:00
..
9p
Merge branch 'master' into next
2008-11-18 18:52:37 +11:00
802
net/802/fc.c: Fix compilation warnings
2008-10-15 00:13:53 -07:00
8021q
vlan: Fix typos in proc output string
2008-11-10 13:37:40 -08:00
appletalk
net: Rationalise email address: Network Specific Parts
2008-10-13 19:01:08 -07:00
atm
net/atm/lec.c: drop code after return
2008-09-22 19:24:45 -07:00
ax25
CRED: Wrap task credential accesses in the AX25 protocol
2008-11-14 10:39:06 +11:00
bluetooth
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
2008-10-17 08:58:52 -07:00
bridge
net: Fix disjunct computation of netdev features
2008-10-23 01:11:29 -07:00
can
net: Remove CONFIG_KMOD from net/ (towards removing CONFIG_KMOD entirely)
2008-10-16 15:24:51 -07:00
core
Merge branch 'master' into next
2008-11-18 18:52:37 +11:00
dccp
dccp: Port redirection support for DCCP
2008-10-19 23:36:47 -07:00
decnet
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
2008-10-17 08:58:52 -07:00
dsa
dsa: fix master interface allmulti/promisc handling
2008-11-10 21:53:12 -08:00
econet
netns: Use net_eq() to compare net-namespaces for optimization.
2008-07-19 22:34:43 -07:00
ethernet
dsa: add support for Trailer tagging format
2008-10-08 17:24:16 -07:00
ieee80211
net/ieee80211: adjust error handling
2008-08-22 16:29:49 -04:00
ipv4
Merge branch 'master' into next
2008-11-18 18:52:37 +11:00
ipv6
Merge branch 'master' into next
2008-11-18 18:52:37 +11:00
ipx
netns: Use net_eq() to compare net-namespaces for optimization.
2008-07-19 22:34:43 -07:00
irda
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
2008-07-20 17:43:29 -07:00
iucv
iucv: Fix mismerge again.
2008-09-30 03:03:35 -07:00
key
af_key: mark policy as dead before destroying
2008-11-06 23:08:37 -08:00
lapb
…
llc
netns: Use net_eq() to compare net-namespaces for optimization.
2008-07-19 22:34:43 -07:00
mac80211
mac80211: fix notify_mac function
2008-11-12 16:49:53 -05:00
netfilter
Merge branch 'master' into next
2008-11-14 11:29:12 +11:00
netlabel
netlabel: Fix compilation warnings in net/netlabel/netlabel_addrlist.c
2008-10-30 10:44:48 -04:00
netlink
net: Remove CONFIG_KMOD from net/ (towards removing CONFIG_KMOD entirely)
2008-10-16 15:24:51 -07:00
netrom
CRED: Wrap task credential accesses in the netrom protocol
2008-11-14 10:39:08 +11:00
packet
net: convert BUG_TRAP to generic WARN_ON
2008-07-25 21:43:18 -07:00
phonet
Phonet: refuse to send bigger than MTU packets
2008-11-16 19:48:49 -08:00
rfkill
Fix logic error in rfkill_check_duplicity
2008-11-06 16:37:09 -05:00
rose
CRED: Wrap task credential accesses in the ROSE protocol
2008-11-14 10:39:08 +11:00
rxrpc
CRED: Inaugurate COW credentials
2008-11-14 10:39:23 +11:00
sched
CRED: Use creds in file structs
2008-11-14 10:39:25 +11:00
sctp
sctp: Fix to handle SHUTDOWN in SHUTDOWN_RECEIVED state
2008-10-23 01:01:18 -07:00
sunrpc
CRED: Wrap current->cred and a few other accessors
2008-11-14 10:39:18 +11:00
tipc
tipc: Don't use structure names which easily globally conflict.
2008-09-02 23:38:32 -07:00
unix
Merge branch 'master' into next
2008-11-14 11:29:12 +11:00
wanrouter
wanmain.c doesn't need syncppp.h
2008-07-23 23:00:36 +02:00
wireless
wireless: fix regression caused by regulatory config option
2008-10-26 10:38:52 -07:00
x25
netns: Use net_eq() to compare net-namespaces for optimization.
2008-07-19 22:34:43 -07:00
xfrm
xfrm: Fix xfrm_policy_gc_lock handling.
2008-11-03 19:11:29 -08:00
compat.c
net: put_cmsg_compat + SO_TIMESTAMP[NS]: use same name for value as caller
2008-11-12 01:54:56 -08:00
Kconfig
net: Distributed Switch Architecture protocol support
2008-10-08 17:15:19 -07:00
Makefile
net: Distributed Switch Architecture protocol support
2008-10-08 17:15:19 -07:00
nonet.c
…
socket.c
CRED: Wrap task credential accesses in the networking subsystem
2008-11-14 10:39:10 +11:00
sysctl_net.c
missing bits of net-namespace / sysctl
2008-07-27 09:45:34 -07:00
TUNABLE
…