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
..
accessibility
acpi	acpi: fix oops in acpi_system_wakeup_device_seq_show	2008-11-16 10:09:34 -08:00
amba
ata	libata: improve phantom device detection	2008-11-14 18:51:57 -05:00
atm
auxdisplay
base	sysfs: Fix return values for sysdev_store_{ulong,int}	2008-10-29 15:03:49 -07:00
block	Merge branch 'master' into next	2008-11-18 18:52:37 +11:00
bluetooth	bpa10x: free sk_buff with kfree_skb	2008-10-31 00:40:19 -07:00
cdrom	gdrom: Fix compile error	2008-10-28 17:46:02 +09:00
char	Merge branch 'master' into next	2008-11-18 18:52:37 +11:00
clocksource
connector	CRED: Use RCU to access another task's creds and to release a task's own creds	2008-11-14 10:39:19 +11:00
cpufreq
cpuidle	regression: disable timer peek-ahead for 2.6.28	2008-11-09 16:28:42 -08:00
crypto
dca	[4/4] dca: fixup initialization dependency	2008-11-10 15:01:03 -08:00
dio
dma	dmaengine: struct device - replace bus_id with dev_name(), dev_set_name()	2008-11-11 13:12:33 -07:00
edac	i5000-edac: hold reference to mci kobject	2008-11-12 17:17:16 -08:00
eisa
firewire	firewire: struct device - replace bus_id with dev_name(), dev_set_name()	2008-10-31 08:48:25 +01:00
firmware	trivial: dmi_scan typo	2008-11-07 08:25:43 -08:00
gpio	GPIO: add new Xilinx driver for powerpc	2008-11-12 17:17:16 -08:00
gpu	drm/i915: Move legacy breadcrumb out of the reserved status page area	2008-11-11 18:03:28 +10:00
hid	HID: don't grab devices with no input	2008-11-14 14:10:01 +01:00
hwmon	LIS3LV02Dx: remove unused #include <version.h>	2008-11-15 12:11:27 -08:00
i2c	i2c: fix i2c-sh_mobile rx underrun	2008-11-13 15:37:07 +09:00
ide	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2008-11-15 18:58:37 -08:00
idle	i7300_idle: Kconfig, show menu only on x86_64	2008-10-28 00:14:47 -04:00
ieee1394	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6	2008-11-06 15:55:34 -08:00
infiniband	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband	2008-11-12 10:56:31 -08:00
input	saner FASYNC handling on file close	2008-11-01 09:49:46 -07:00
isdn	Merge branch 'master' into next	2008-11-18 18:52:37 +11:00
leds	remove unused #include <version.h>'s	2008-11-01 09:50:12 -07:00
lguest
macintosh
mca
md	dm: avoid destroying table in dm_any_congested	2008-11-13 23:39:14 +00:00
media	V4L/DVB (9624): CVE-2008-5033: fix OOPS on tvaudio when controlling bass/treble	2008-11-14 14:39:47 -02:00
memstick	[PATCH] switch memstick	2008-10-21 07:48:33 -04:00
message	trivial: MPT fusion - remove long dead code	2008-11-07 08:25:43 -08:00
mfd	mfd: Correct WM8350 I2C return code usage	2008-11-16 19:58:47 +01:00
misc	misc: C2port needs <linux/sched.h>	2008-11-15 11:36:06 -08:00
mmc	mmc: struct device - replace bus_id with dev_name(), dev_set_name()	2008-11-08 21:37:46 +01:00
mtd	[ARM] cdb89712: avoid namespace clashes with SRAM_ and BOOTROM_ constants	2008-11-13 15:05:03 +00:00
net	Merge branch 'master' into next	2008-11-18 18:52:37 +11:00
nubus
of	OF-device: Don't overwrite numa_node in device registration	2008-10-31 16:12:01 +11:00
oprofile	oprofile: fix memory ordering	2008-10-27 19:15:41 +01:00
parisc	[PATCH] introduce fmode_t, do annotations	2008-10-21 07:47:06 -04:00
parport	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2008-10-30 12:52:53 -07:00
pci	PCI: ignore bit0 of _OSC return code	2008-11-11 13:33:05 -08:00
pcmcia	pcmcia: ensure correct logging in do_io_probe	2008-11-09 21:47:47 +01:00
pnp	drivers: remove duplicated #include	2008-11-04 08:18:19 -08:00
power
ps3	powerpc/ps3: Fix compile error in ps3-lpm.c	2008-11-05 19:59:08 +11:00
rapidio
regulator	regulator: Use menuconfig in Kconfig	2008-11-09 14:49:23 +00:00
rtc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6	2008-11-17 07:54:47 -08:00
s390	Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6	2008-11-15 11:38:02 -08:00
sbus	drivers: remove duplicated #include	2008-11-04 08:18:19 -08:00
scsi	[SCSI] dpt_i2o: fix transferred data length for scsi_set_resid()	2008-11-15 11:10:14 -06:00
serial	serial: sh-sci: Reorder the SCxTDR write after the TDxE clear.	2008-11-13 17:46:06 +09:00
sh
sn
spi	atmel_spi: work-around required for new HW bug in AT91SAM9263 Rev.B SPI controller	2008-11-12 17:17:17 -08:00
ssb	SSB: hide empty sub menu	2008-11-10 13:50:17 -08:00
staging	Don't ask twice about not including staging drivers	2008-11-09 12:47:04 -08:00
tc
telephony	telephony: trivial: fix up email address	2008-11-11 09:30:23 -08:00
thermal
uio	saner FASYNC handling on file close	2008-11-01 09:49:46 -07:00
usb	Merge branch 'master' into next	2008-11-18 18:52:37 +11:00
uwb
video	fbdev: fix fb_compat_ioctl() deadlocks	2008-11-06 15:41:19 -08:00
virtio
w1	hdq: bQ27000 HDQ Slave Interface Driver	2008-11-12 17:17:18 -08:00
watchdog	Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc	2008-11-11 09:24:31 -08:00
xen	drivers: remove duplicated #include	2008-11-04 08:18:19 -08:00
zorro
Kconfig	regulator: Build on non-ARM platforms	2008-10-28 21:47:17 +00:00
Makefile	Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb	2008-10-26 16:35:46 -07:00