Linux 4.4.28
Greg KH
maintainerI'm announcing the release of the 4.4.28 kernel.
All users of the 4.4 kernel series must upgrade.
The updated 4.4.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.4.y
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Documentation/kernel-parameters.txt | 9 - Makefile | 2 arch/arc/kernel/signal.c | 8 arch/arm64/include/asm/percpu.h | 120 ++++++-------- arch/arm64/kernel/head.S | 3 arch/metag/include/asm/atomic.h | 3 arch/mips/include/asm/ptrace.h | 2 arch/mips/vdso/Makefile | 2 arch/parisc/include/asm/pgtable.h | 6 arch/parisc/kernel/setup.c | 8 arch/parisc/kernel/vmlinux.lds.S | 7 arch/powerpc/kernel/vdso64/datapage.S | 2 arch/powerpc/kernel/vdso64/gettimeofday.S | 2 arch/powerpc/lib/copyuser_64.S | 2 arch/powerpc/mm/copro_fault.c | 2 arch/powerpc/platforms/powernv/eeh-powernv.c | 4 arch/powerpc/platforms/powernv/pci.c | 4 arch/powerpc/platforms/pseries/lpar.c | 4 arch/s390/include/asm/tlbflush.h | 3 arch/s390/mm/pgtable.c | 4 arch/x86/kernel/e820.c | 2 arch/x86/kvm/ioapic.c | 2 block/blk-cgroup.c | 4 crypto/asymmetric_keys/pkcs7_parser.c | 4 drivers/acpi/nfit.c | 3 drivers/acpi/nfit.h | 4 drivers/base/platform.c | 4 drivers/clk/imx/clk-imx6q.c | 18 ++ drivers/cpufreq/intel_pstate.c | 10 - drivers/gpio/gpio-mpc8xxx.c | 2 drivers/input/mouse/elantech.c | 25 ++- drivers/input/serio/i8042-io.h | 2 drivers/input/serio/i8042-ip22io.h | 2 drivers/input/serio/i8042-ppcio.h | 2 drivers/input/serio/i8042-sparcio.h | 2 drivers/input/serio/i8042-unicore32io.h | 2 drivers/input/serio/i8042-x86ia64io.h | 96 +++++++++++ drivers/input/serio/i8042.c | 55 +++++- drivers/irqchip/irq-gic-v3.c | 2 drivers/md/dm-crypt.c | 24 +- drivers/md/dm-mpath.c | 6 drivers/md/dm.c | 10 - drivers/media/dvb-frontends/mb86a20s.c | 104 ++++++------ drivers/media/usb/cx231xx/cx231xx-avcore.c | 5 drivers/media/usb/cx231xx/cx231xx-cards.c | 2 drivers/media/usb/cx231xx/cx231xx-core.c | 3 drivers/memstick/host/rtsx_usb_ms.c | 6 drivers/misc/mei/hw-me-regs.h | 3 drivers/misc/mei/pci-me.c | 3 drivers/mmc/card/block.c | 5 drivers/mmc/card/queue.h | 2 drivers/mmc/host/rtsx_usb_sdmmc.c | 7 drivers/mmc/host/sdhci.c | 2 drivers/mtd/ubi/wl.c | 21 ++ drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 4 drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 2 drivers/net/wireless/realtek/rtlwifi/regd.c | 4 drivers/pci/quirks.c | 1 drivers/regulator/tps65910-regulator.c | 6 drivers/s390/scsi/zfcp_dbf.c | 162 +++++++++++++++++--- drivers/s390/scsi/zfcp_dbf.h | 14 + drivers/s390/scsi/zfcp_erp.c | 12 + drivers/s390/scsi/zfcp_ext.h | 8 drivers/s390/scsi/zfcp_fsf.c | 22 ++ drivers/s390/scsi/zfcp_fsf.h | 4 drivers/s390/scsi/zfcp_scsi.c | 8 drivers/scsi/hpsa.c | 78 +++++++++ drivers/scsi/scsi_scan.c | 2 drivers/scsi/sd.c | 8 drivers/scsi/sd.h | 5 drivers/target/target_core_transport.c | 11 + drivers/target/target_core_xcopy.c | 34 +++- drivers/video/fbdev/efifb.c | 6 fs/ceph/file.c | 3 fs/cifs/cifs_debug.c | 57 +------ fs/cifs/cifs_debug.h | 2 fs/cifs/cifsfs.c | 9 - fs/cifs/cifsglob.h | 34 ++-- fs/cifs/cifssmb.c | 4 fs/cifs/connect.c | 16 + fs/cifs/file.c | 66 ++++---- fs/cifs/misc.c | 15 - fs/cifs/readdir.c | 6 fs/cifs/smb2glob.h | 10 + fs/cifs/smb2inode.c | 6 fs/cifs/smb2misc.c | 16 - fs/cifs/smb2ops.c | 12 - fs/cifs/smb2pdu.c | 25 ++- fs/cifs/smb2pdu.h | 2 fs/ext4/sysfs.c | 4 fs/isofs/inode.c | 8 fs/jbd2/transaction.c | 3 fs/nfs/delegation.c | 16 + fs/nfs/nfs42proc.c | 1 fs/nfs/nfs4state.c | 3 fs/overlayfs/copy_up.c | 12 + fs/overlayfs/dir.c | 5 fs/pstore/ram.c | 17 +- fs/pstore/ram_core.c | 49 ------ fs/super.c | 6 fs/ubifs/xattr.c | 2 include/linux/devfreq-event.h | 5 include/linux/irqchip/arm-gic-v3.h | 2 include/linux/kernel.h | 2 include/linux/lightnvm.h | 121 +++++++------- include/linux/sem.h | 1 include/linux/string.h | 6 include/linux/swap.h | 2 include/target/target_core_base.h | 1 ipc/sem.c | 130 +++++++++------- lib/kstrtox.c | 64 +++++++ lib/string.c | 29 --- mm/filemap.c | 95 ++++++----- mm/workingset.c | 10 - net/sunrpc/xprtsock.c | 11 + sound/pci/hda/dell_wmi_helper.c | 2 sound/pci/hda/thinkpad_helper.c | 2 tools/perf/util/intel-pt-decoder/intel-pt-decoder.c | 38 ++++ tools/perf/util/intel-pt.c | 15 + 119 files changed, 1310 insertions(+), 667 deletions(-)
Adrian Hunter (3):
perf intel-pt: Fix snapshot overlap detection decoder errors perf intel-pt: Fix estimated timestamps for cycle-accurate mode perf intel-pt: Fix MTC timestamp calculation for large MTC periods
Al Viro (1):
arc: don't leak bits of kernel stack into coredump
Alan Stern (1):
memstick: rtsx_usb_ms: Runtime resume the device when polling for cards
Alexander Usyskin (1):
mei: me: add kaby point device ids
Andrew Bresticker (1):
pstore/ram: Use memcpy_fromio() to save old buffer
Anton Blanchard (1):
powerpc/vdso64: Use double word compare on pointers
Aurelien Aptel (1):
fs/cifs: keep guid when assigning fid to fileinfo
Bart Van Assche (2):
dm: mark request_queue dead before destroying the DM device
blkcg: Unlock blkcg_pol_mutex only once when cpd == NULL
Dan Carpenter (2):
scsi: zfcp: spin_lock_irqsave() is not nestable irqchip/gicv3: Handle loop timeout proper
Dan Williams (1):
x86/e820: Don't merge consecutive E820_PRAM ranges
Daniel Glöckner (1):
mmc: block: don't use CMD23 with very old MMC cards
David Hildenbrand (1):
s390/mm: fix gmap tlb flush issues
David Vrabel (1):
sunrpc: fix write space race causing stalls
Dinesh Israni (1):
target: Don't override EXTENDED_COPY xcopy_pt_cmd SCSI status code
Dmitry Torokhov (1):
Input: elantech - add Fujitsu Lifebook E556 to force crc_enabled
Don Brace (1):
hpsa: correct skipping masked peripherals
Eric Biggers (1):
ext4: do not advertise encryption support when disabled
Frederic Barrat (1):
powerpc/mm: Prevent unlikely crash in copro_calculate_slb()
Furquan Shaikh (1):
pstore/ram: Use memcpy_toio instead of memcpy
Gavin Shan (3):
powerpc/powernv: Pass CPU-endian PE number to opal_pci_eeh_freeze_clear() powerpc/powernv: Use CPU-endian hub diag-data type in pnv_eeh_get_and_dump_hub_diag() powerpc/powernv: Use CPU-endian PEST in pnv_pci_dump_p7ioc_diag_data()
Greg Kroah-Hartman (1):
Linux 4.4.28
Guenter Roeck (1):
metag: Only define atomic_dec_if_positive conditionally
Haibo Chen (1):
mmc: sdhci: cast unsigned int to unsigned long long to avoid unexpeted error
Helge Deller (3):
parisc: Increase KERNEL_INITIAL_SIZE for 32-bit SMP kernels
parisc: Fix kernel memory layout regarding position of __gp
parisc: Increase initial kernel mapping size
Hui Wang (1):
ALSA: hda - Fix a failure of micmute led when having multi adcs
Jack Morgenstein (1):
net/mlx4_core: Allow resetting VF admin mac to zero
James Hogan (1):
MIPS: Fix -mabi=64 build of vdso.lds
Jan Kara (1):
isofs: Do not return EACCES for unknown filesystems
Jan Remmet (1):
regulator: tps65910: Work around silicon erratum SWCZ010
Jeff Layton (1):
NFSv4.2: Fix a reference leak in nfs42_proc_layoutstats_generic
Jens Axboe (1):
lightnvm: ensure that nvm_dev_ops can be used without CONFIG_NVM
Jiri Slaby (2):
kvm: x86: memset whole irq_eoi
mmc: core: Annotate cmd_hdr as __le32
Johannes Weiner (3):
mm: filemap: don't plant shadow entries without radix tree node
mm: workingset: fix crash in shadow node shrinker caused by replace_page_cache_page()
mm: filemap: fix mapping->nrpages double accounting in fuse
Kees Cook (3):
lib: move strtobool() to kstrtobool()
lib: update single-char callers of strtobool()
lib: add "on"/"off" support to kstrtobool
Larry Finger (1):
rtlwifi: Fix missing country code for Great Britain
Laurent Dufour (1):
powerpc/pseries: Fix stack corruption in htpe code
Lin Huang (1):
PM / devfreq: event: remove duplicate devfreq_event_get_drvdata()
Linus Torvalds (1):
Using BUG_ON() as an assert() is _never_ acceptable
Liu Gang (1):
gpio: mpc8xxx: Correct irq handler function
Lucas Stach (1):
clk: imx6: initialize GPU clocks
Maik Broemme (1):
PCI: Mark Atheros AR9580 to avoid bus reset
Manfred Spraul (1):
ipc/sem.c: fix complex_count vs. simple op race
Marc Zyngier (1):
arm64: kernel: Init MDCR_EL2 even in the absence of a PMU
Marcin Nowakowski (1):
MIPS: ptrace: Fix regs_return_value for kernel context
Marcos Paulo de Souza (1):
Input: i8042 - skip selftest on ASUS laptops
Martin K. Petersen (1):
sd: Fix rw_max for devices that report an optimal xfer size
Matti Kurkela (1):
Input: elantech - force needed quirks on Fujitsu H760
Mauro Carvalho Chehab (4):
mb86a20s: fix the locking logic
mb86a20s: fix demod settings
cx231xx: don't return error on success
cx231xx: fix GPIOs for Pixelview SBTVD hybrid
Max Staudt (1):
fbdev/efifb: Fix 16 color palette entry calculation
Mike Snitzer (1):
dm mpath: check if path's request_queue is dying in activate_path()
Miklos Szeredi (1):
ovl: copy_up_xattr(): use strnlen
Minfei Huang (1):
dm: return correct error code in dm_resume()'s retry loop
Ming Lei (1):
scsi: Fix use-after-free
Nicholas Bellinger (2):
target: Re-add missing SCF_ACK_KREF assignment in v4.1.y
target: Make EXTENDED_COPY 0xe4 failure return COPY TARGET DEVICE NOT REACHABLE
Nikolay Borisov (1):
ceph: fix error handling in ceph_read_iter
Oleg Nesterov (1):
fs/super.c: fix race between freeze_super() and thaw_super()
Paul Mackerras (1):
powerpc/64: Fix incorrect return value from __copy_tofrom_user
Peter Jones (1):
PKCS#7: Don't require SpcSpOpusInfo in Authenticode pkcs7 signatures
Rabin Vincent (1):
dm crypt: fix crash on exit
Richard Weinberger (3):
ubi: Deal with interrupted erasures in WL
ovl: Fix info leak in ovl_lookup_temp()
ubifs: Fix xattr_names length in exit paths
Ross Lagerwall (1):
cifs: Limit the overall credit acquired
Sachin Prabhu (1):
Fix regression which breaks DFS mounting
Sebastian Andrzej Siewior (2):
pstore/ramoops: fixup driver removal
pstore/core: drop cmpxchg based updates
Sergei Shtylyov (1):
platform: don't return 0 from platform_get_irq[_byname]() on error
Srinivas Pandruvada (1):
cpufreq: intel_pstate: Fix unsafe HWP MSR access
Steffen Maier (10):
zfcp: fix fc_host port_type with NPIV
zfcp: fix ELS/GS request&response length for hardware data router
zfcp: close window with unblocked rport during rport gone
zfcp: retain trace level for SCSI and HBA FSF response records
zfcp: restore: Dont use 0 to indicate invalid LUN in rec trace
zfcp: trace on request for open and close of WKA port
zfcp: restore tracing of handle for port and LUN with HBA records
zfcp: fix D_ID field with actual value on tracing SAN responses
zfcp: fix payload trace length for SAN request&response
zfcp: trace full payload of all SAN records (req,resp,iels)
Steve French (6):
Clarify locking of cifs file and tcon structures and make more granular Display number of credits available
Set previous session id correctly on SMB3 reconnect
SMB3: GUIDs should be constructed as random but valid uuids Do not send SMB3 SET_INFO request if nothing is changing Cleanup missing frees on some ioctls
Taesoo Kim (1):
jbd2: fix incorrect unlock on j_list_lock
Trond Myklebust (3):
NFSv4: Don't report revoked delegations as valid in nfs_have_delegation()
NFSv4: nfs4_copy_delegation_stateid() must fail if the delegation is invalid
NFSv4: Open state recovery must account for file permission changes
Ulf Hansson (3):
memstick: rtsx_usb_ms: Manage runtime PM when accessing the device
mmc: rtsx_usb_sdmmc: Avoid keeping the device runtime resumed when unused
mmc: rtsx_usb_sdmmc: Handle runtime PM while changing the led
Vishal Verma (1):
acpi, nfit: check for the correct event code in notifications
Vladimir Murzin (1):
irqchip/gic-v3-its: Fix entry size mask for GITS_BASER
Will Deacon (1):
arm64: percpu: rewrite ll/sc loops in assembly
Yuval Mintz (1):
bnx2x: Prevent false warning for lack of FC NPIV
Greg KH
maintainerDocumentation/kernel-parameters.txt +8 -1
@@ -1371,7 +1371,14 @@ bytes respectively. Such letter suffixes can also be entirely omitted. i8042.nopnp [HW] Don't use ACPIPnP / PnPBIOS to discover KBD/AUX controllers i8042.notimeout [HW] Ignore timeout condition signalled by controller - i8042.reset [HW] Reset the controller during init and cleanup + i8042.reset [HW] Reset the controller during init, cleanup and + suspend-to-ram transitions, only during s2r + transitions, or never reset + Format: { 1 | Y | y | 0 | N | n } + 1, Y, y: always reset controller + 0, N, n: don't ever reset controller + Default: only on s2r transitions on x86; most other + architectures force reset to be always executed i8042.unlock [HW] Unlock (ignore) the keylock i8042.kbdreset [HW] Reset device connected to KBD port
Makefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 4 PATCHLEVEL = 4 -SUBLEVEL = 27 +SUBLEVEL = 28 EXTRAVERSION = NAME = Blurry Fish Butt
arch/arc/kernel/signal.c +4 -4
@@ -107,13 +107,13 @@ static int restore_usr_regs(struct pt_regs *regs, struct rt_sigframe __user *sf)struct user_regs_struct uregs; err =__copy_from_user (&set, &sf->uc.uc_sigmask,sizeof (set)); -if (!err) -set_current_blocked (&set); - err |=__copy_from_user (&uregs.scratch, &(sf->uc.uc_mcontext.regs.scratch),sizeof (sf->uc.uc_mcontext.regs.scratch)); +if (err) +return err; +set_current_blocked (&set); regs->bta = uregs.scratch.bta; regs->lp_start = uregs.scratch.lp_start; regs->lp_end = uregs.scratch.lp_end;
@@ -138,7 +138,7 @@ static int restore_usr_regs(struct pt_regs *regs, struct rt_sigframe __user *sf) regs->r0 = uregs.scratch.r0; regs->sp = uregs.scratch.sp; -return err; +return 0 ; }static inline int is_do_ss_needed (unsigned int magic)
arch/arm64/include/asm/percpu.h +56 -64
148 lines not on this page · raw message
arch/arm64/kernel/head.S +2 -1
@@ -518,8 +518,9 @@ CPU_LE( movk x0, #0x30d0, lsl #16 ) // Clear EE and E0E on LE systems b.lt 4f // Skip if no PMU present mrs x0, pmcr_el0 // Disable debug access traps ubfx x0, x0, #11, #5 // to EL2 and allow access to - msr mdcr_el2, x0 // all PMU counters from EL1 4: + csel x0, xzr, x0, lt // all PMU counters from EL1 + msr mdcr_el2, x0 // (if they exist) /* Stage-2 translation */ msr vttbr_el2, xzr
arch/metag/include/asm/atomic.h +1 -2
@@ -39,11 +39,10 @@#define atomic_dec (v) atomic_sub(1, (v))#define atomic_inc_not_zero (v) atomic_add_unless((v), 1, 0) +#define atomic_dec_if_positive (v) atomic_sub_if_positive(1, v)#endif -#define atomic_dec_if_positive (v) atomic_sub_if_positive(1, v) -#include <asm-generic/atomic64.h> #endif /* __ASM_METAG_ATOMIC_H */
arch/mips/include/asm/ptrace.h +1 -1
@@ -152,7 +152,7 @@ static inline int is_syscall_success(struct pt_regs *regs)static inline long regs_return_value (struct pt_regs *regs) { -if (is_syscall_success (regs)) +if (is_syscall_success (regs) || !user_mode (regs))return regs->regs[2 ];else return -regs->regs[2 ];
arch/mips/vdso/Makefile +1 -1
@@ -75,7 +75,7 @@ obj-vdso := $(obj-vdso-y:%.o=$(obj)/%.o) $(obj-vdso): KBUILD_CFLAGS := $(cflags-vdso) $(native-abi) $(obj-vdso): KBUILD_AFLAGS := $(aflags-vdso) $(native-abi) -$(obj)/vdso.lds: KBUILD_CPPFLAGS := $(native-abi) +$(obj)/vdso.lds: KBUILD_CPPFLAGS := $(ccflags-vdso) $(native-abi) $(obj)/vdso.so.dbg: $(obj)/vdso.lds $(obj-vdso) FORCE $(call if_changed,vdsold)
arch/parisc/include/asm/pgtable.h +3 -3
@@ -83,10 +83,10 @@ static inline void purge_tlb_entries(struct mm_struct *mm, unsigned long addr)printk ("%s:%d: bad pgd %08lx.\n" , __FILE__, __LINE__, (unsigned long )pgd_val (e)) /* This is the size of the initially mapped kernel memory */ -#ifdef CONFIG_64BIT -#define KERNEL_INITIAL_ORDER 25/* 1<<25 = 32MB */ +#if defined(CONFIG_64BIT ) +#define KERNEL_INITIAL_ORDER 26/* 1<<26 = 64MB */ #else -#define KERNEL_INITIAL_ORDER 24/* 1<<24 = 16MB */ +#define KERNEL_INITIAL_ORDER 25/* 1<<25 = 32MB */ #endif #define KERNEL_INITIAL_SIZE (1 << KERNEL_INITIAL_ORDER)
arch/parisc/kernel/setup.c +8 -0
@@ -38,6 +38,7 @@#include <linux/export.h> #include <asm/processor.h> +#include <asm/sections.h> #include <asm/pdc.h> #include <asm/led.h> #include <asm/machdep.h> /* for pa7300lc_init() proto */
@@ -140,6 +141,13 @@ void __init setup_arch(char **cmdline_p)#endif printk (KERN_CONT ".\n" ); +/* +* Check if initial kernel page mappings are sufficient. +* panic early if not, else we may access kernel functions +* and variables which can't be reached. +*/ +if (__pa ((unsigned long ) &_end) >=KERNEL_INITIAL_SIZE ) +panic ("KERNEL_INITIAL_ORDER too small!" );pdc_console_init ();
arch/parisc/kernel/vmlinux.lds.S +5 -2
@@ -88,8 +88,9 @@ SECTIONS /* Start of data section */ _sdata = .; - RO_DATA_SECTION(8) - + /* Architecturally we need to keep __gp below 0x1000000 and thus + * in front of RO_DATA_SECTION() which stores lots of tracepoint + * and ftrace symbols. */ #ifdef CONFIG_64BIT . = ALIGN(16); /* Linkage tables */
@@ -104,6 +105,8 @@ SECTIONS } #endif + RO_DATA_SECTION(8) + /* unwind info */ .PARISC.unwind : { __start___unwind = .;
arch/powerpc/kernel/vdso64/datapage.S +1 -1
@@ -59,7 +59,7 @@ V_FUNCTION_BEGIN(__kernel_get_syscall_map) bl V_LOCAL_FUNC(__get_datapage) mtlr r12 addi r3,r3,CFG_SYSCALL_MAP64 - cmpli cr0,r4,0 + cmpldi cr0,r4,0 crclr cr0*4+so beqlr li r0,__NR_syscalls
arch/powerpc/kernel/vdso64/gettimeofday.S +1 -1
@@ -145,7 +145,7 @@ V_FUNCTION_BEGIN(__kernel_clock_getres) bne cr0,99f li r3,0 - cmpli cr0,r4,0 + cmpldi cr0,r4,0 crclr cr0*4+so beqlr lis r5,CLOCK_REALTIME_RES@h
arch/powerpc/lib/copyuser_64.S +1 -1
@@ -359,6 +359,7 @@ END_FTR_SECTION_IFCLR(CPU_FTR_UNALIGNED_LD_STD) addi r3,r3,8 171: 177: +179: addi r3,r3,8 370: 372:
@@ -373,7 +374,6 @@ END_FTR_SECTION_IFCLR(CPU_FTR_UNALIGNED_LD_STD) 173: 174: 175: -179: 181: 184: 186:
arch/powerpc/mm/copro_fault.c +2 -0
@@ -106,6 +106,8 @@ int copro_calculate_slb(struct mm_struct *mm, u64 ea, struct copro_slb *slb)switch (REGION_ID (ea)) {case USER_REGION_ID :pr_devel ("%s: 0x%llx -- USER_REGION_ID\n" , __func__, ea); +if (mm ==NULL ) +return 1 ; psize =get_slice_psize (mm, ea); ssize =user_segment_size (ea); vsid =get_vsid (mm->context.id, ea, ssize);
arch/powerpc/platforms/powernv/eeh-powernv.c +2 -2
@@ -1163,7 +1163,7 @@ static void pnv_eeh_get_and_dump_hub_diag(struct pci_controller *hose)return ; } -switch (data->type) { +switch (be16_to_cpu (data->type)) {case OPAL_P7IOC_DIAG_TYPE_RGC :pr_info ("P7IOC diag-data for RGC\n\n" );pnv_eeh_dump_hub_diag_common (data);
@@ -1395,7 +1395,7 @@ static int pnv_eeh_next_error(struct eeh_pe **pe)/* Try best to clear it */ opal_pci_eeh_freeze_clear (phb->opal_id, - frozen_pe_no, +be64_to_cpu (frozen_pe_no),OPAL_EEH_ACTION_CLEAR_FREEZE_ALL ); ret =EEH_NEXT_ERR_NONE ; } else if ((*pe)->state & EEH_PE_ISOLATED ||
arch/powerpc/platforms/powernv/pci.c +2 -2
@@ -197,8 +197,8 @@ static void pnv_pci_dump_p7ioc_diag_data(struct pci_controller *hose, be64_to_cpu(data->dma1ErrorLog1));for (i =0 ; i <OPAL_P7IOC_NUM_PEST_REGS ; i++) { -if ((data->pestA[i] >>63 ) ==0 && - (data->pestB[i] >>63 ) ==0 ) +if ((be64_to_cpu (data->pestA[i]) >>63 ) ==0 && + (be64_to_cpu (data->pestB[i]) >>63 ) ==0 )continue ; pr_info("PE[%3d] A/B: %016llx %016llx\n",
arch/powerpc/platforms/pseries/lpar.c +2 -2
@@ -406,7 +406,7 @@ static void __pSeries_lpar_hugepage_invalidate(unsigned long *slot, unsigned long *vpn, int count, int psize, int ssize) { - unsigned long param[8]; + unsigned long param[PLPAR_HCALL9_BUFSIZE];int i =0 , pix =0 , rc;unsigned long flags =0 ;int lock_tlbie = !mmu_has_feature (MMU_FTR_LOCKLESS_TLBIE );
@@ -523,7 +523,7 @@ static void pSeries_lpar_flush_hash_range(unsigned long number, int local)unsigned long flags =0 ;struct ppc64_tlb_batch *batch =this_cpu_ptr (&ppc64_tlb_batch);int lock_tlbie = !mmu_has_feature (MMU_FTR_LOCKLESS_TLBIE ); -unsigned long param[9 ]; +unsigned long param[PLPAR_HCALL9_BUFSIZE ];unsigned long hash, index, shift, hidx, slot;real_pte_t pte;int psize, ssize;
arch/s390/include/asm/tlbflush.h +2 -1
@@ -81,7 +81,8 @@ static inline void __tlb_flush_full(struct mm_struct *mm) }/* -* Flush TLB entries for a specific ASCE on all CPUs. +* Flush TLB entries for a specific ASCE on all CPUs. Should never be used +* when more than one asce (e.g. gmap) ran on this mm. */ static inline void __tlb_flush_asce (struct mm_struct *mm,unsigned long asce) {
arch/s390/mm/pgtable.c +2 -2
@@ -166,7 +166,7 @@ EXPORT_SYMBOL_GPL(gmap_alloc);static void gmap_flush_tlb (struct gmap *gmap) {if (MACHINE_HAS_IDTE ) -__tlb_flush_asce (gmap->mm, gmap->asce); +__tlb_flush_idte (gmap->asce);else __tlb_flush_global (); }
@@ -205,7 +205,7 @@ void gmap_free(struct gmap *gmap)/* Flush tlb. */ if (MACHINE_HAS_IDTE ) -__tlb_flush_asce (gmap->mm, gmap->asce); +__tlb_flush_idte (gmap->asce);else __tlb_flush_global ();
arch/x86/kernel/e820.c +1 -1
@@ -347,7 +347,7 @@ int __init sanitize_e820_map(struct e820entry *biosmap, int max_nr_map,* continue building up new bios map based on this * information */ -if (current_type != last_type) { +if (current_type != last_type || current_type ==E820_PRAM ) {if (last_type !=0 ) { new_bios[new_bios_entry].size = change_point[chgidx]->addr - last_addr;
arch/x86/kvm/ioapic.c +1 -1
@@ -580,7 +580,7 @@ static void kvm_ioapic_reset(struct kvm_ioapic *ioapic) ioapic->irr =0 ; ioapic->irr_delivered =0 ; ioapic->id =0 ; -memset (ioapic->irq_eoi,0x00 ,IOAPIC_NUM_PINS ); +memset (ioapic->irq_eoi,0x00 ,sizeof (ioapic->irq_eoi));rtc_irq_eoi_tracking_reset (ioapic); }
block/blk-cgroup.c +1 -3
@@ -1331,10 +1331,8 @@ int blkcg_policy_register(struct blkcg_policy *pol)struct blkcg_policy_data *cpd; cpd = pol->cpd_alloc_fn (GFP_KERNEL ); -if (!cpd) { -mutex_unlock (&blkcg_pol_mutex); +if (!cpd) goto err_free_cpds; - } blkcg->cpd[pol->plid] = cpd; cpd->blkcg = blkcg;
crypto/asymmetric_keys/pkcs7_parser.c +1 -3
@@ -547,9 +547,7 @@ int pkcs7_sig_note_set_of_authattrs(void *context, size_t hdrlen,struct pkcs7_signed_info *sinfo = ctx->sinfo;if (!test_bit (sinfo_has_content_type, &sinfo->aa_set) || - !test_bit (sinfo_has_message_digest, &sinfo->aa_set) || - (ctx->msg->data_type == OID_msIndirectData && - !test_bit (sinfo_has_ms_opus_info, &sinfo->aa_set))) { + !test_bit (sinfo_has_message_digest, &sinfo->aa_set)) {pr_warn ("Missing required AuthAttr\n" );return -EBADMSG ; }
drivers/acpi/nfit.c +3 -0
@@ -1806,6 +1806,9 @@ static void acpi_nfit_notify(struct acpi_device *adev, u32 event)dev_dbg (dev,"%s: event: %d\n" , __func__, event); +if (event !=NFIT_NOTIFY_UPDATE ) +return ; +device_lock (dev);if (!dev->driver) {/* dev->driver may be null if we're being removed */
drivers/acpi/nfit.h +4 -0
@@ -45,6 +45,10 @@ enum { ND_BLK_DCR_LATCH = 2, }; +enum nfit_root_notifiers { +NFIT_NOTIFY_UPDATE =0x80 , +}; +struct nfit_spa {struct acpi_nfit_system_address *spa;struct list_head list;
drivers/base/platform.c +2 -2
@@ -96,7 +96,7 @@ int platform_get_irq(struct platform_device *dev, unsigned int num)int ret; ret =of_irq_get (dev->dev.of_node, num); -if (ret >=0 || ret == -EPROBE_DEFER ) +if (ret >0 || ret == -EPROBE_DEFER )return ret; }
@@ -154,7 +154,7 @@ int platform_get_irq_byname(struct platform_device *dev, const char *name)int ret; ret =of_irq_get_byname (dev->dev.of_node, name); -if (ret >=0 || ret == -EPROBE_DEFER ) +if (ret >0 || ret == -EPROBE_DEFER )return ret; }
drivers/clk/imx/clk-imx6q.c +18 -0
@@ -550,6 +550,24 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node)if (IS_ENABLED (CONFIG_PCI_IMX6 ))clk_set_parent (clk[IMX6QDL_CLK_LVDS1_SEL ], clk[IMX6QDL_CLK_SATA_REF_100M ]); +/* +* Initialize the GPU clock muxes, so that the maximum specified clock +* rates for the respective SoC are not exceeded. +*/ +if (clk_on_imx6dl ()) { +clk_set_parent (clk[IMX6QDL_CLK_GPU3D_CORE_SEL ], + clk[IMX6QDL_CLK_PLL2_PFD1_594M ]); +clk_set_parent (clk[IMX6QDL_CLK_GPU2D_CORE_SEL ], + clk[IMX6QDL_CLK_PLL2_PFD1_594M ]); + }else if (clk_on_imx6q ()) { +clk_set_parent (clk[IMX6QDL_CLK_GPU3D_CORE_SEL ], + clk[IMX6QDL_CLK_MMDC_CH0_AXI ]); +clk_set_parent (clk[IMX6QDL_CLK_GPU3D_SHADER_SEL ], + clk[IMX6QDL_CLK_PLL2_PFD1_594M ]); +clk_set_parent (clk[IMX6QDL_CLK_GPU2D_CORE_SEL ], + clk[IMX6QDL_CLK_PLL3_USB_OTG ]); + } +imx_register_uart_clocks (uart_clks); }CLK_OF_DECLARE (imx6q,"fsl,imx6q-ccm" , imx6q_clocks_init);
drivers/cpufreq/intel_pstate.c +5 -5
@@ -285,14 +285,14 @@ static void intel_pstate_hwp_set(void)int min, hw_min, max, hw_max, cpu, range, adj_range;u64 value, cap; -rdmsrl (MSR_HWP_CAPABILITIES , cap); - hw_min =HWP_LOWEST_PERF (cap); - hw_max =HWP_HIGHEST_PERF (cap); - range = hw_max - hw_min; -get_online_cpus ();for_each_online_cpu (cpu) { +rdmsrl_on_cpu (cpu,MSR_HWP_CAPABILITIES , &cap); + hw_min =HWP_LOWEST_PERF (cap); + hw_max =HWP_HIGHEST_PERF (cap); + range = hw_max - hw_min; +rdmsrl_on_cpu (cpu,MSR_HWP_REQUEST , &value); adj_range = limits->min_perf_pct * range /100 ; min = hw_min + adj_range;
drivers/gpio/gpio-mpc8xxx.c +1 -1
@@ -329,7 +329,7 @@ static int mpc8xxx_gpio_irq_map(struct irq_domain *h, unsigned int irq, irq_hw_number_t hwirq) {irq_set_chip_data (irq, h->host_data); -irq_set_chip_and_handler (irq, &mpc8xxx_irq_chip, handle_level_irq); +irq_set_chip_and_handler (irq, &mpc8xxx_irq_chip, handle_edge_irq);return 0 ; }
drivers/input/mouse/elantech.c +23 -2
@@ -1163,6 +1163,13 @@ static const struct dmi_system_id elantech_dmi_has_middle_button[] = { DMI_MATCH(DMI_PRODUCT_NAME, "CELSIUS H730"), }, }, + { +/* Fujitsu H760 also has a middle button */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"FUJITSU" ), + DMI_MATCH(DMI_PRODUCT_NAME, "CELSIUS H760"), + }, + }, #endif { } };
@@ -1507,10 +1514,10 @@ static const struct dmi_system_id elantech_dmi_force_crc_enabled[] = { }, }, { -/* Fujitsu LIFEBOOK E554 does not work with crc_enabled == 0 */ +/* Fujitsu H760 does not work with crc_enabled == 0 */ .matches = {DMI_MATCH (DMI_SYS_VENDOR ,"FUJITSU" ), - DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK E554"), + DMI_MATCH(DMI_PRODUCT_NAME, "CELSIUS H760"), }, }, {
@@ -1521,6 +1528,20 @@ static const struct dmi_system_id elantech_dmi_force_crc_enabled[] = { }, }, { +/* Fujitsu LIFEBOOK E554 does not work with crc_enabled == 0 */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"FUJITSU" ), + DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK E554"), + }, + }, + { +/* Fujitsu LIFEBOOK E556 does not work with crc_enabled == 0 */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"FUJITSU" ), + DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK E556"), + }, + }, + {/* Fujitsu LIFEBOOK U745 does not work with crc_enabled == 0 */ .matches = { DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),
drivers/input/serio/i8042-io.h +1 -1
@@ -81,7 +81,7 @@ static inline int i8042_platform_init(void)return -EBUSY ;#endif - i8042_reset =1 ; + i8042_reset =I8042_RESET_ALWAYS ;return 0 ; }
drivers/input/serio/i8042-ip22io.h +1 -1
@@ -61,7 +61,7 @@ static inline int i8042_platform_init(void)return -EBUSY ;#endif - i8042_reset =1 ; + i8042_reset =I8042_RESET_ALWAYS ;return 0 ; }
drivers/input/serio/i8042-ppcio.h +1 -1
@@ -44,7 +44,7 @@ static inline void i8042_write_command(int val)static inline int i8042_platform_init (void ) { - i8042_reset =1 ; + i8042_reset =I8042_RESET_ALWAYS ;return 0 ; }
drivers/input/serio/i8042-sparcio.h +1 -1
@@ -130,7 +130,7 @@ static int __init i8042_platform_init(void) } } - i8042_reset =1 ; + i8042_reset =I8042_RESET_ALWAYS ;return 0 ; }
drivers/input/serio/i8042-unicore32io.h +1 -1
@@ -61,7 +61,7 @@ static inline int i8042_platform_init(void)if (!request_mem_region (I8042_REGION_START ,I8042_REGION_SIZE ,"i8042" ))return -EBUSY ; - i8042_reset =1 ; + i8042_reset =I8042_RESET_ALWAYS ;return 0 ; }
drivers/input/serio/i8042-x86ia64io.h +93 -3
111 lines not on this page · raw message
drivers/input/serio/i8042.c +44 -11
105 lines not on this page · raw message
drivers/irqchip/irq-gic-v3.c +1 -1
@@ -142,7 +142,7 @@ static void gic_enable_redist(bool enable)return ;/* No PM support in this redistributor */ } -while (count--) { +while (--count) { val =readl_relaxed (rbase +GICR_WAKER );if (enable ^ (val & GICR_WAKER_ChildrenAsleep))break ;
drivers/md/dm-crypt.c +10 -14
@@ -112,8 +112,7 @@ struct iv_tcw_private {* and encrypts / decrypts at the same time. */ enum flags {DM_CRYPT_SUSPENDED ,DM_CRYPT_KEY_VALID , -DM_CRYPT_SAME_CPU ,DM_CRYPT_NO_OFFLOAD , -DM_CRYPT_EXIT_THREAD }; +DM_CRYPT_SAME_CPU ,DM_CRYPT_NO_OFFLOAD };/* * The fields in here must be read only after initialization.
@@ -1204,18 +1203,20 @@ continue_locked:if (!RB_EMPTY_ROOT (&cc->write_tree)) goto pop_from_list; -if (unlikely (test_bit (DM_CRYPT_EXIT_THREAD , &cc->flags))) { -spin_unlock_irq (&cc->write_thread_wait.lock); -break ; - } - -__set_current_state (TASK_INTERRUPTIBLE ); +set_current_state (TASK_INTERRUPTIBLE );__add_wait_queue (&cc->write_thread_wait, &wait);spin_unlock_irq (&cc->write_thread_wait.lock); +if (unlikely (kthread_should_stop ())) { +set_task_state (current,TASK_RUNNING ); +remove_wait_queue (&cc->write_thread_wait, &wait); +break ; + } +schedule (); +set_task_state (current,TASK_RUNNING );spin_lock_irq (&cc->write_thread_wait.lock);__remove_wait_queue (&cc->write_thread_wait, &wait); goto continue_locked;
@@ -1530,13 +1531,8 @@ static void crypt_dtr(struct dm_target *ti)if (!cc)return ; -if (cc->write_thread) { -spin_lock_irq (&cc->write_thread_wait.lock); -set_bit (DM_CRYPT_EXIT_THREAD , &cc->flags); -wake_up_locked (&cc->write_thread_wait); -spin_unlock_irq (&cc->write_thread_wait.lock); +if (cc->write_thread)kthread_stop (cc->write_thread); - }if (cc->io_queue)destroy_workqueue (cc->io_queue);
drivers/md/dm-mpath.c +3 -3
@@ -1220,10 +1220,10 @@ static void activate_path(struct work_struct *work) {struct pgpath *pgpath = container_of(work, struct pgpath, activate_path.work); +struct request_queue *q =bdev_get_queue (pgpath->path.dev->bdev); -if (pgpath->is_active) -scsi_dh_activate (bdev_get_queue (pgpath->path.dev->bdev), - pg_init_done, pgpath); +if (pgpath->is_active && !blk_queue_dying (q)) +scsi_dh_activate (q, pg_init_done, pgpath);else pg_init_done (pgpath,SCSI_DH_DEV_OFFLINED ); }
drivers/md/dm.c +7 -3
@@ -2869,6 +2869,7 @@ EXPORT_SYMBOL_GPL(dm_device_name);static void __dm_destroy (struct mapped_device *md,bool wait) { +struct request_queue *q =dm_get_md_queue (md);struct dm_table *map;int srcu_idx;
@@ -2879,6 +2880,10 @@ static void __dm_destroy(struct mapped_device *md, bool wait)set_bit (DMF_FREEING , &md->flags);spin_unlock (&_minor_lock); +spin_lock_irq (q->queue_lock); +queue_flag_set (QUEUE_FLAG_DYING , q); +spin_unlock_irq (q->queue_lock); +if (dm_request_based (md) && md->kworker_task)flush_kthread_worker (&md->kworker);
@@ -3245,10 +3250,11 @@ static int __dm_resume(struct mapped_device *md, struct dm_table *map)int dm_resume (struct mapped_device *md) { -int r = -EINVAL ; +int r;struct dm_table *map =NULL ; retry: + r = -EINVAL ;mutex_lock_nested (&md->suspend_lock,SINGLE_DEPTH_NESTING );if (!dm_suspended_md (md))
@@ -3272,8 +3278,6 @@ retry: goto out;clear_bit (DMF_SUSPENDED , &md->flags); - - r =0 ; out:mutex_unlock (&md->suspend_lock);
drivers/media/dvb-frontends/mb86a20s.c +53 -51
156 lines not on this page · raw message
drivers/media/usb/cx231xx/cx231xx-avcore.c +4 -1
@@ -1264,7 +1264,10 @@ int cx231xx_set_agc_analog_digital_mux_select(struct cx231xx *dev, dev->board.agc_analog_digital_select_gpio, analog_or_digital); -return status; +if (status <0 ) +return status; + +return 0 ; }int cx231xx_enable_i2c_port_3 (struct cx231xx *dev,bool is_port_3)
drivers/media/usb/cx231xx/cx231xx-cards.c +1 -1
@@ -486,7 +486,7 @@ struct cx231xx_board cx231xx_boards[] = { .output_mode = OUT_MODE_VIP11, .demod_xfer_mode = 0, .ctl_pin_status_mask = 0xFFFFFFC4, - .agc_analog_digital_select_gpio = 0x00, /* According with PV cxPolaris.inf file */ + .agc_analog_digital_select_gpio = 0x1c, .tuner_sif_gpio = -1, .tuner_scl_gpio = -1, .tuner_sda_gpio = -1,
drivers/media/usb/cx231xx/cx231xx-core.c +2 -1
@@ -712,6 +712,7 @@ int cx231xx_set_mode(struct cx231xx *dev, enum cx231xx_mode set_mode)break ;case CX231XX_BOARD_CNXT_RDE_253S :case CX231XX_BOARD_CNXT_RDU_253S : +case CX231XX_BOARD_PV_PLAYTV_USB_HYBRID : errCode =cx231xx_set_agc_analog_digital_mux_select (dev,1 );break ;case CX231XX_BOARD_HAUPPAUGE_EXETER :
@@ -738,7 +739,7 @@ int cx231xx_set_mode(struct cx231xx *dev, enum cx231xx_mode set_mode)case CX231XX_BOARD_PV_PLAYTV_USB_HYBRID :case CX231XX_BOARD_HAUPPAUGE_USB2_FM_PAL :case CX231XX_BOARD_HAUPPAUGE_USB2_FM_NTSC : - errCode =cx231xx_set_agc_analog_digital_mux_select (dev,0 ); + errCode =cx231xx_set_agc_analog_digital_mux_select (dev,0 );break ;default :break ;
drivers/memstick/host/rtsx_usb_ms.c +6 -0
@@ -524,6 +524,7 @@ static void rtsx_usb_ms_handle_req(struct work_struct *work)int rc;if (!host->req) { +pm_runtime_get_sync (ms_dev (host)); do { rc = memstick_next_req(msh, &host->req); dev_dbg(ms_dev(host), "next req %d\n", rc);
@@ -544,6 +545,7 @@ static void rtsx_usb_ms_handle_req(struct work_struct *work) host->req->error); } }while (!rc); +pm_runtime_put (ms_dev (host)); } }
@@ -570,6 +572,7 @@ static int rtsx_usb_ms_set_param(struct memstick_host *msh,dev_dbg (ms_dev (host),"%s: param = %d, value = %d\n" , __func__, param, value); +pm_runtime_get_sync (ms_dev (host));mutex_lock (&ucr->dev_mutex); err =rtsx_usb_card_exclusive_check (ucr,RTSX_USB_MS_CARD );
@@ -635,6 +638,7 @@ static int rtsx_usb_ms_set_param(struct memstick_host *msh, } out:mutex_unlock (&ucr->dev_mutex); +pm_runtime_put (ms_dev (host));/* power-on delay */ if (param ==MEMSTICK_POWER && value ==MEMSTICK_POWER_ON )
@@ -681,6 +685,7 @@ static int rtsx_usb_detect_ms_card(void *__host)int err;for (;;) { +pm_runtime_get_sync (ms_dev (host));mutex_lock (&ucr->dev_mutex);/* Check pending MS card changes */
@@ -703,6 +708,7 @@ static int rtsx_usb_detect_ms_card(void *__host) } poll_again: +pm_runtime_put (ms_dev (host));if (host->eject)break ;
drivers/misc/mei/hw-me-regs.h +3 -0
@@ -66,6 +66,9 @@#ifndef _MEI_HW_MEI_REGS_H_#define _MEI_HW_MEI_REGS_H_ +#define MEI_DEV_ID_KBP 0xA2BA/* Kaby Point */ +#define MEI_DEV_ID_KBP_2 0xA2BB/* Kaby Point 2 */ +/* * MEI device IDs */
drivers/misc/mei/pci-me.c +3 -0
@@ -87,6 +87,9 @@ static const struct pci_device_id mei_me_pci_tbl[] = { {MEI_PCI_DEVICE(MEI_DEV_ID_SPT_H, mei_me_pch8_cfg)}, {MEI_PCI_DEVICE(MEI_DEV_ID_SPT_H_2, mei_me_pch8_cfg)}, + {MEI_PCI_DEVICE(MEI_DEV_ID_KBP, mei_me_pch8_cfg)}, + {MEI_PCI_DEVICE(MEI_DEV_ID_KBP_2, mei_me_pch8_cfg)}, +/* required last entry */ {0, } };
drivers/mmc/card/block.c +3 -2
@@ -1755,7 +1755,7 @@ static void mmc_blk_packed_hdr_wrq_prep(struct mmc_queue_req *mqrq,struct mmc_blk_data *md = mq->data;struct mmc_packed *packed = mqrq->packed;bool do_rel_wr, do_data_tag; -u32 *packed_cmd_hdr; +__le32 *packed_cmd_hdr;u8 hdr_blocks;u8 i =1 ;
@@ -2279,7 +2279,8 @@ static struct mmc_blk_data *mmc_blk_alloc_req(struct mmc_card *card,set_capacity (md->disk, size);if (mmc_host_cmd23 (card->host)) { -if (mmc_card_mmc (card) || +if ((mmc_card_mmc (card) && + card->csd.mmca_vsn >=CSD_SPEC_VER_3 ) || (mmc_card_sd (card) && card->scr.cmds &SD_SCR_CMD23_SUPPORT )) md->flags |=MMC_BLK_CMD23 ;
drivers/mmc/card/queue.h +1 -1
@@ -25,7 +25,7 @@ enum mmc_packed_type {struct mmc_packed {struct list_head list; -u32 cmd_hdr[1024 ]; +__le32 cmd_hdr[1024 ];unsigned int blocks;u8 nr_entries;u8 retries;
drivers/mmc/host/rtsx_usb_sdmmc.c +2 -5
@@ -1138,11 +1138,6 @@ static void sdmmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)dev_dbg (sdmmc_dev (host),"%s\n" , __func__);mutex_lock (&ucr->dev_mutex); -if (rtsx_usb_card_exclusive_check (ucr,RTSX_USB_SD_CARD )) { -mutex_unlock (&ucr->dev_mutex); -return ; - } -sd_set_power_mode (host, ios->power_mode);sd_set_bus_width (host, ios->bus_width);sd_set_timing (host, ios->timing, &host->ddr_mode);
@@ -1314,6 +1309,7 @@ static void rtsx_usb_update_led(struct work_struct *work) container_of(work, struct rtsx_usb_sdmmc, led_work);struct rtsx_ucr *ucr = host->ucr; +pm_runtime_get_sync (sdmmc_dev (host));mutex_lock (&ucr->dev_mutex);if (host->led.brightness ==LED_OFF )
@@ -1322,6 +1318,7 @@ static void rtsx_usb_update_led(struct work_struct *work)rtsx_usb_turn_on_led (ucr);mutex_unlock (&ucr->dev_mutex); + pm_runtime_put(sdmmc_dev(host)); }#endif
drivers/mmc/host/sdhci.c +1 -1
@@ -675,7 +675,7 @@ static u8 sdhci_calc_timeout(struct sdhci_host *host, struct mmc_command *cmd)* host->clock is in Hz. target_timeout is in us. * Hence, us = 1000000 * cycles / Hz. Round up. */ - val =1000000 * data->timeout_clks; + val =1000000ULL * data->timeout_clks;if (do_div (val, host->clock)) target_timeout++; target_timeout += val;
drivers/mtd/ubi/wl.c +19 -2
@@ -643,7 +643,7 @@ static int wear_leveling_worker(struct ubi_device *ubi, struct ubi_work *wrk, int shutdown) {int err, scrubbing =0 , torture =0 , protect =0 , erroneous =0 ; -int vol_id =-1 , lnum =-1 ; +int erase =0 , keep =0 , vol_id =-1 , lnum =-1 ;#ifdef CONFIG_MTD_UBI_FASTMAP int anchor = wrk->anchor;#endif
@@ -777,6 +777,16 @@ static int wear_leveling_worker(struct ubi_device *ubi, struct ubi_work *wrk, e1->pnum); scrubbing =1 ; goto out_not_moved; + }else if (ubi->fast_attach && err ==UBI_IO_BAD_HDR_EBADMSG ) { +/* +* While a full scan would detect interrupted erasures +* at attach time we can face them here when attached from +* Fastmap. +*/ +dbg_wl ("PEB %d has ECC errors, maybe from an interrupted erasure" , + e1->pnum); + erase =1 ; + goto out_not_moved; } ubi_err(ubi, "error %d while reading VID header from PEB %d",
@@ -810,6 +820,7 @@ static int wear_leveling_worker(struct ubi_device *ubi, struct ubi_work *wrk,* Target PEB had bit-flips or write error - torture it. */ torture =1 ; + keep =1 ; goto out_not_moved; }
@@ -895,7 +906,7 @@ out_not_moved: ubi->erroneous_peb_count +=1 ; }else if (scrubbing)wl_tree_add (e1, &ubi->scrub); -else +else if (keep)wl_tree_add (e1, &ubi->used);ubi_assert (!ubi->move_to_put); ubi->move_from = ubi->move_to =NULL ;
@@ -907,6 +918,12 @@ out_not_moved:if (err) goto out_ro; +if (erase) { + err =do_sync_erase (ubi, e1, vol_id, lnum,1 ); +if (err) + goto out_ro; + } +mutex_unlock (&ubi->move_mutex);return 0 ;
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +4 -0
@@ -14819,6 +14819,10 @@ static int bnx2x_get_fc_npiv(struct net_device *dev, } offset =SHMEM2_RD (bp, fc_npiv_nvram_tbl_addr[BP_PORT (bp)]); +if (!offset) { +DP (BNX2X_MSG_MCP ,"No FC-NPIV in NVRAM\n" ); + goto out; + }DP (BNX2X_MSG_MCP ,"Offset of FC-NPIV in NVRAM: %08x\n" , offset);/* Read the table contents from nvram */
drivers/net/ethernet/mellanox/mlx4/en_netdev.c +1 -1
@@ -2282,7 +2282,7 @@ static int mlx4_en_set_vf_mac(struct net_device *dev, int queue, u8 *mac)struct mlx4_en_dev *mdev = en_priv->mdev;u64 mac_u64 =mlx4_mac_to_u64 (mac); -if (!is_valid_ether_addr (mac)) +if (is_multicast_ether_addr (mac))return -EINVAL ;return mlx4_set_vf_mac (mdev->dev, en_priv->port, queue, mac_u64);
drivers/net/wireless/realtek/rtlwifi/regd.c +3 -1
@@ -345,9 +345,9 @@ static const struct ieee80211_regdomain *_rtl_regdomain_select(return &rtl_regdom_no_midband;case COUNTRY_CODE_IC :return &rtl_regdom_11; -case COUNTRY_CODE_ETSI :case COUNTRY_CODE_TELEC_NETGEAR :return &rtl_regdom_60_64; +case COUNTRY_CODE_ETSI :case COUNTRY_CODE_SPAIN :case COUNTRY_CODE_FRANCE :case COUNTRY_CODE_ISRAEL :
@@ -406,6 +406,8 @@ static u8 channel_plan_to_country_code(u8 channelplan)return COUNTRY_CODE_WORLD_WIDE_13 ;case 0x22 :return COUNTRY_CODE_IC ; +case 0x25 : +return COUNTRY_CODE_ETSI ;case 0x32 :return COUNTRY_CODE_TELEC_NETGEAR ;case 0x41 :
drivers/pci/quirks.c +1 -0
@@ -3136,6 +3136,7 @@ static void quirk_no_bus_reset(struct pci_dev *dev)DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_ATHEROS ,0x0030 , quirk_no_bus_reset);DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_ATHEROS ,0x0032 , quirk_no_bus_reset);DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_ATHEROS ,0x003c , quirk_no_bus_reset); +DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_ATHEROS ,0x0033 , quirk_no_bus_reset);static void quirk_no_pm_reset (struct pci_dev *dev) {
drivers/regulator/tps65910-regulator.c +6 -0
@@ -1111,6 +1111,12 @@ static int tps65910_probe(struct platform_device *pdev) pmic->num_regulators =ARRAY_SIZE (tps65910_regs); pmic->ext_sleep_control = tps65910_ext_sleep_control; info = tps65910_regs; +/* Work around silicon erratum SWCZ010: output programmed +* voltage level can go higher than expected or crash +* Workaround: use no synchronization of DCDC clocks +*/ +tps65910_reg_clear_bits (pmic->mfd,TPS65910_DCDCCTRL , +DCDCCTRL_DCDCCKSYNC_MASK );break ;case TPS65911 : pmic->get_ctrl_reg = &tps65911_get_ctrl_register;
drivers/s390/scsi/zfcp_dbf.c +144 -18
244 lines not on this page · raw message
drivers/s390/scsi/zfcp_dbf.h +11 -3
@@ -2,7 +2,7 @@* zfcp device driver * debug feature declarations * -* Copyright IBM Corp. 2008, 2010 +* Copyright IBM Corp. 2008, 2015 */ #ifndef ZFCP_DBF_H
@@ -17,6 +17,11 @@#define ZFCP_DBF_INVALID_LUN 0xFFFFFFFFFFFFFFFFull +enum zfcp_dbf_pseudo_erp_act_type { +ZFCP_PSEUDO_ERP_ACTION_RPORT_ADD =0xff , +ZFCP_PSEUDO_ERP_ACTION_RPORT_DEL =0xfe , +}; +/** * struct zfcp_dbf_rec_trigger - trace record for triggered recovery action * @ready: number of ready recovery actions
@@ -110,6 +115,7 @@ struct zfcp_dbf_san {u32 d_id;#define ZFCP_DBF_SAN_MAX_PAYLOAD (FC_CT_HDR_LEN + 32)char payload[ZFCP_DBF_SAN_MAX_PAYLOAD ]; +u16 pl_len; } __packed;/**
@@ -126,6 +132,8 @@ struct zfcp_dbf_hba_res {u8 prot_status_qual[FSF_PROT_STATUS_QUAL_SIZE ];u32 fsf_status;u8 fsf_status_qual[FSF_STATUS_QUALIFIER_SIZE ]; +u32 port_handle; +u32 lun_handle; } __packed;/**
@@ -279,7 +287,7 @@ static inlinevoid zfcp_dbf_hba_fsf_resp (char *tag,int level,struct zfcp_fsf_req *req) {if (debug_level_enabled (req->adapter->dbf->hba, level)) -zfcp_dbf_hba_fsf_res (tag, req); +zfcp_dbf_hba_fsf_res (tag, level, req); }/**
@@ -318,7 +326,7 @@ void _zfcp_dbf_scsi(char *tag, int level, struct scsi_cmnd *scmd, scmd->device->host->hostdata[0 ];if (debug_level_enabled (adapter->dbf->scsi, level)) -zfcp_dbf_scsi (tag, scmd, req); +zfcp_dbf_scsi (tag, level, scmd, req); }/**
drivers/s390/scsi/zfcp_erp.c +9 -3
@@ -3,7 +3,7 @@* * Error Recovery Procedures (ERP). * -* Copyright IBM Corp. 2002, 2010 +* Copyright IBM Corp. 2002, 2015 */ #define KMSG_COMPONENT "zfcp"
@@ -1217,8 +1217,14 @@ static void zfcp_erp_action_cleanup(struct zfcp_erp_action *act, int result)break ;case ZFCP_ERP_ACTION_REOPEN_PORT : -if (result ==ZFCP_ERP_SUCCEEDED ) -zfcp_scsi_schedule_rport_register (port); +/* This switch case might also happen after a forced reopen +* was successfully done and thus overwritten with a new +* non-forced reopen at `ersfs_2'. In this case, we must not +* do the clean-up of the non-forced version. +*/ +if (act->step !=ZFCP_ERP_STEP_UNINITIALIZED ) +if (result ==ZFCP_ERP_SUCCEEDED ) +zfcp_scsi_schedule_rport_register (port);/* fall through */ case ZFCP_ERP_ACTION_REOPEN_PORT_FORCED :put_device (&port->dev);
drivers/s390/scsi/zfcp_ext.h +5 -3
@@ -3,7 +3,7 @@* * External function declarations. * -* Copyright IBM Corp. 2002, 2010 +* Copyright IBM Corp. 2002, 2015 */ #ifndef ZFCP_EXT_H
@@ -35,8 +35,9 @@ extern void zfcp_dbf_adapter_unregister(struct zfcp_adapter *);extern void zfcp_dbf_rec_trig (char *,struct zfcp_adapter *,struct zfcp_port *,struct scsi_device *,u8 ,u8 );extern void zfcp_dbf_rec_run (char *,struct zfcp_erp_action *); +extern void zfcp_dbf_rec_run_wka (char *,struct zfcp_fc_wka_port *,u64 );extern void zfcp_dbf_hba_fsf_uss (char *,struct zfcp_fsf_req *); -extern void zfcp_dbf_hba_fsf_res (char *,struct zfcp_fsf_req *); +extern void zfcp_dbf_hba_fsf_res (char *,int ,struct zfcp_fsf_req *);extern void zfcp_dbf_hba_bit_err (char *,struct zfcp_fsf_req *);extern void zfcp_dbf_hba_berr (struct zfcp_dbf *,struct zfcp_fsf_req *);extern void zfcp_dbf_hba_def_err (struct zfcp_adapter *,u64 ,u16 ,void **);
@@ -44,7 +45,8 @@ extern void zfcp_dbf_hba_basic(char *, struct zfcp_adapter *);extern void zfcp_dbf_san_req (char *,struct zfcp_fsf_req *,u32 );extern void zfcp_dbf_san_res (char *,struct zfcp_fsf_req *);extern void zfcp_dbf_san_in_els (char *,struct zfcp_fsf_req *); -extern void zfcp_dbf_scsi (char *,struct scsi_cmnd *,struct zfcp_fsf_req *); +extern void zfcp_dbf_scsi (char *,int ,struct scsi_cmnd *, +struct zfcp_fsf_req *);/* zfcp_erp.c */ extern void zfcp_erp_set_adapter_status (struct zfcp_adapter *,u32 );
drivers/s390/scsi/zfcp_fsf.c +17 -5
@@ -3,7 +3,7 @@* * Implementation of FSF commands. * -* Copyright IBM Corp. 2002, 2013 +* Copyright IBM Corp. 2002, 2015 */ #define KMSG_COMPONENT "zfcp"
@@ -508,7 +508,10 @@ static int zfcp_fsf_exchange_config_evaluate(struct zfcp_fsf_req *req)fc_host_port_type (shost) =FC_PORTTYPE_PTP ;break ;case FSF_TOPO_FABRIC : -fc_host_port_type (shost) =FC_PORTTYPE_NPORT ; +if (bottom->connection_features &FSF_FEATURE_NPIV_MODE ) +fc_host_port_type (shost) =FC_PORTTYPE_NPIV ; +else +fc_host_port_type (shost) =FC_PORTTYPE_NPORT ;break ;case FSF_TOPO_AL :fc_host_port_type (shost) =FC_PORTTYPE_NLPORT ;
@@ -613,7 +616,6 @@ static void zfcp_fsf_exchange_port_evaluate(struct zfcp_fsf_req *req)if (adapter->connection_features &FSF_FEATURE_NPIV_MODE ) {fc_host_permanent_port_name (shost) = bottom->wwpn; -fc_host_port_type (shost) =FC_PORTTYPE_NPIV ; }else fc_host_permanent_port_name (shost) =fc_host_port_name (shost);fc_host_maxframe_size (shost) = bottom->maximum_frame_size;
@@ -982,8 +984,12 @@ static int zfcp_fsf_setup_ct_els_sbals(struct zfcp_fsf_req *req,if (zfcp_adapter_multi_buffer_active (adapter)) {if (zfcp_qdio_sbals_from_sg (qdio, &req->qdio_req, sg_req))return -EIO ; + qtcb->bottom.support.req_buf_length = +zfcp_qdio_real_bytes (sg_req);if (zfcp_qdio_sbals_from_sg (qdio, &req->qdio_req, sg_resp))return -EIO ; + qtcb->bottom.support.resp_buf_length = +zfcp_qdio_real_bytes (sg_resp);zfcp_qdio_set_data_div (qdio, &req->qdio_req,zfcp_qdio_sbale_count (sg_req));
@@ -1073,6 +1079,7 @@ int zfcp_fsf_send_ct(struct zfcp_fc_wka_port *wka_port, req->handler = zfcp_fsf_send_ct_handler; req->qtcb->header.port_handle = wka_port->handle; + ct->d_id = wka_port->d_id; req->data = ct;zfcp_dbf_san_req ("fssct_1" , req, wka_port->d_id);
@@ -1169,6 +1176,7 @@ int zfcp_fsf_send_els(struct zfcp_adapter *adapter, u32 d_id,hton24 (req->qtcb->bottom.support.d_id, d_id); req->handler = zfcp_fsf_send_els_handler; + els->d_id = d_id; req->data = els;zfcp_dbf_san_req ("fssels1" , req, d_id);
@@ -1575,7 +1583,7 @@ out:int zfcp_fsf_open_wka_port (struct zfcp_fc_wka_port *wka_port) {struct zfcp_qdio *qdio = wka_port->adapter->qdio; -struct zfcp_fsf_req *req; +struct zfcp_fsf_req *req =NULL ;int retval = -EIO ;spin_lock_irq (&qdio->req_q_lock);
@@ -1604,6 +1612,8 @@ int zfcp_fsf_open_wka_port(struct zfcp_fc_wka_port *wka_port)zfcp_fsf_req_free (req); out:spin_unlock_irq (&qdio->req_q_lock); +if (req && !IS_ERR (req)) +zfcp_dbf_rec_run_wka ("fsowp_1" , wka_port, req->req_id);return retval; }
@@ -1628,7 +1638,7 @@ static void zfcp_fsf_close_wka_port_handler(struct zfcp_fsf_req *req)int zfcp_fsf_close_wka_port (struct zfcp_fc_wka_port *wka_port) {struct zfcp_qdio *qdio = wka_port->adapter->qdio; -struct zfcp_fsf_req *req; +struct zfcp_fsf_req *req =NULL ;int retval = -EIO ;spin_lock_irq (&qdio->req_q_lock);
@@ -1657,6 +1667,8 @@ int zfcp_fsf_close_wka_port(struct zfcp_fc_wka_port *wka_port)zfcp_fsf_req_free (req); out:spin_unlock_irq (&qdio->req_q_lock); +if (req && !IS_ERR (req)) +zfcp_dbf_rec_run_wka ("fscwp_1" , wka_port, req->req_id);return retval; }
drivers/s390/scsi/zfcp_fsf.h +3 -1
@@ -3,7 +3,7 @@* * Interface to the FSF support functions. * -* Copyright IBM Corp. 2002, 2010 +* Copyright IBM Corp. 2002, 2015 */ #ifndef FSF_H
@@ -436,6 +436,7 @@ struct zfcp_blk_drv_data {* @handler_data: data passed to handler function * @port: Optional pointer to port for zfcp internal ELS (only test link ADISC) * @status: used to pass error status to calling function +* @d_id: Destination ID of either open WKA port for CT or of D_ID for ELS */ struct zfcp_fsf_ct_els {struct scatterlist *req;
@@ -444,6 +445,7 @@ struct zfcp_fsf_ct_els {void *handler_data;struct zfcp_port *port;int status; + u32 d_id; };#endif /* FSF_H */
drivers/s390/scsi/zfcp_scsi.c +7 -1
@@ -3,7 +3,7 @@* * Interface to Linux SCSI midlayer. * -* Copyright IBM Corp. 2002, 2013 +* Copyright IBM Corp. 2002, 2015 */ #define KMSG_COMPONENT "zfcp"
@@ -556,6 +556,9 @@ static void zfcp_scsi_rport_register(struct zfcp_port *port) ids.port_id = port->d_id; ids.roles =FC_RPORT_ROLE_FCP_TARGET ; +zfcp_dbf_rec_trig ("scpaddy" , port->adapter, port,NULL , +ZFCP_PSEUDO_ERP_ACTION_RPORT_ADD , +ZFCP_PSEUDO_ERP_ACTION_RPORT_ADD ); rport =fc_remote_port_add (port->adapter->scsi_host,0 , &ids);if (!rport) { dev_err(&port->adapter->ccw_device->dev,
@@ -577,6 +580,9 @@ static void zfcp_scsi_rport_block(struct zfcp_port *port)struct fc_rport *rport = port->rport;if (rport) { +zfcp_dbf_rec_trig ("scpdely" , port->adapter, port,NULL , +ZFCP_PSEUDO_ERP_ACTION_RPORT_DEL , +ZFCP_PSEUDO_ERP_ACTION_RPORT_DEL );fc_remote_port_delete (rport); port->rport =NULL ; }
drivers/scsi/hpsa.c +74 -4
96 lines not on this page · raw message
drivers/scsi/scsi_scan.c +1 -1
@@ -1459,12 +1459,12 @@ retry: out_err:kfree (lun_data); out: -scsi_device_put (sdev);if (scsi_device_created (sdev))/* * the sdev we used didn't appear in the report luns scan */ __scsi_remove_device (sdev); +scsi_device_put (sdev);return ret; }
drivers/scsi/sd.c +4 -4
@@ -2879,10 +2879,10 @@ static int sd_revalidate_disk(struct gendisk *disk)if (sdkp->opt_xfer_blocks && sdkp->opt_xfer_blocks <= dev_max && sdkp->opt_xfer_blocks <=SD_DEF_XFER_BLOCKS && - sdkp->opt_xfer_blocks * sdp->sector_size >=PAGE_CACHE_SIZE ) - rw_max = q->limits.io_opt = - sdkp->opt_xfer_blocks * sdp->sector_size; -else +logical_to_bytes (sdp, sdkp->opt_xfer_blocks) >=PAGE_CACHE_SIZE ) { + q->limits.io_opt =logical_to_bytes (sdp, sdkp->opt_xfer_blocks); + rw_max =logical_to_sectors (sdp, sdkp->opt_xfer_blocks); + }else rw_max =BLK_DEF_MAX_SECTORS ;/* Combine with controller limits */
drivers/scsi/sd.h +5 -0
@@ -151,6 +151,11 @@ static inline sector_t logical_to_sectors(struct scsi_device *sdev, sector_t bloreturn blocks << (ilog2 (sdev->sector_size) -9 ); } +static inline unsigned int logical_to_bytes (struct scsi_device *sdev,sector_t blocks) +{ +return blocks * sdev->sector_size; +} +/* * A DIF-capable target device can be formatted with different * protection schemes. Currently 0 through 3 are defined:
drivers/target/target_core_transport.c +10 -1
@@ -1680,6 +1680,7 @@ void transport_generic_request_failure(struct se_cmd *cmd,case TCM_LOGICAL_BLOCK_GUARD_CHECK_FAILED :case TCM_LOGICAL_BLOCK_APP_TAG_CHECK_FAILED :case TCM_LOGICAL_BLOCK_REF_TAG_CHECK_FAILED : +case TCM_COPY_TARGET_DEVICE_NOT_REACHABLE :break ;case TCM_OUT_OF_RESOURCES : sense_reason =TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE ;
@@ -2509,8 +2510,10 @@ int target_get_sess_cmd(struct se_cmd *se_cmd, bool ack_kref)* fabric acknowledgement that requires two target_put_sess_cmd() * invocations before se_cmd descriptor release. */ -if (ack_kref) +if (ack_kref) {kref_get (&se_cmd->cmd_kref); + se_cmd->se_cmd_flags |=SCF_ACK_KREF ; + }spin_lock_irqsave (&se_sess->sess_cmd_lock, flags);if (se_sess->sess_tearing_down) {
@@ -2833,6 +2836,12 @@ static const struct sense_info sense_info_table[] = { .ascq = 0x03, /* LOGICAL BLOCK REFERENCE TAG CHECK FAILED */ .add_sector_info = true, }, + [TCM_COPY_TARGET_DEVICE_NOT_REACHABLE] = { + .key = COPY_ABORTED, + .asc = 0x0d, + .ascq = 0x02, /* COPY TARGET DEVICE NOT REACHABLE */ + + }, [TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE] = {/* * Returning ILLEGAL REQUEST would cause immediate IO errors on
drivers/target/target_core_xcopy.c +26 -8
@@ -104,7 +104,7 @@ static int target_xcopy_locate_se_dev_e4(struct se_cmd *se_cmd, struct xcopy_op }mutex_unlock (&g_device_mutex); -pr_err ("Unable to locate 0xe4 descriptor for EXTENDED_COPY\n" ); +pr_debug_ratelimited ("Unable to locate 0xe4 descriptor for EXTENDED_COPY\n" );return -EINVAL ; }
@@ -185,7 +185,7 @@ static int target_xcopy_parse_tiddesc_e4(struct se_cmd *se_cmd, struct xcopy_opstatic int target_xcopy_parse_target_descriptors (struct se_cmd *se_cmd,struct xcopy_op *xop,unsigned char *p, -unsigned short tdll) +unsigned short tdll,sense_reason_t *sense_ret) {struct se_device *local_dev = se_cmd->se_dev;unsigned char *desc = p;
@@ -193,6 +193,8 @@ static int target_xcopy_parse_target_descriptors(struct se_cmd *se_cmd,unsigned short start =0 ;bool src = true; + *sense_ret =TCM_INVALID_PARAMETER_LIST ; +if (offset !=0 ) {pr_err ("XCOPY target descriptor list length is not" " multiple of %d\n" ,XCOPY_TARGET_DESC_LEN );
@@ -243,9 +245,16 @@ static int target_xcopy_parse_target_descriptors(struct se_cmd *se_cmd, rc =target_xcopy_locate_se_dev_e4 (se_cmd, xop, true); else rc =target_xcopy_locate_se_dev_e4 (se_cmd, xop, false); - -if (rc <0 ) +/* +* If a matching IEEE NAA 0x83 descriptor for the requested device +* is not located on this node, return COPY_ABORTED with ASQ/ASQC +* 0x0d/0x02 - COPY_TARGET_DEVICE_NOT_REACHABLE to request the +* initiator to fall back to normal copy method. +*/ +if (rc <0 ) { + *sense_ret =TCM_COPY_TARGET_DEVICE_NOT_REACHABLE ; goto out; + }pr_debug ("XCOPY TGT desc: Source dev: %p NAA IEEE WWN: 0x%16phN\n" , xop->src_dev, &xop->src_tid_wwn[0 ]);
@@ -653,6 +662,7 @@ static int target_xcopy_read_source( rc =target_xcopy_setup_pt_cmd (xpt_cmd, xop, src_dev, &cdb[0 ], remote_port, true);if (rc <0 ) { + ec_cmd->scsi_status = xpt_cmd->se_cmd.scsi_status;transport_generic_free_cmd (se_cmd,0 );return rc; }
@@ -664,6 +674,7 @@ static int target_xcopy_read_source( rc =target_xcopy_issue_pt_cmd (xpt_cmd);if (rc <0 ) { + ec_cmd->scsi_status = xpt_cmd->se_cmd.scsi_status;transport_generic_free_cmd (se_cmd,0 );return rc; }
@@ -714,6 +725,7 @@ static int target_xcopy_write_destination( remote_port, false);if (rc <0 ) {struct se_cmd *src_cmd = &xop->src_pt_cmd->se_cmd; + ec_cmd->scsi_status = xpt_cmd->se_cmd.scsi_status;/* * If the failure happened before the t_mem_list hand-off in * target_xcopy_setup_pt_cmd(), Reset memory + clear flag so that
@@ -729,6 +741,7 @@ static int target_xcopy_write_destination( rc =target_xcopy_issue_pt_cmd (xpt_cmd);if (rc <0 ) { + ec_cmd->scsi_status = xpt_cmd->se_cmd.scsi_status; se_cmd->se_cmd_flags &= ~SCF_PASSTHROUGH_SG_TO_MEM_NOALLOC ;transport_generic_free_cmd (se_cmd,0 );return rc;
@@ -815,9 +828,14 @@ static void target_xcopy_do_work(struct work_struct *work) out:xcopy_pt_undepend_remotedev (xop);kfree (xop); - -pr_warn ("target_xcopy_do_work: Setting X-COPY CHECK_CONDITION -> sending response\n" ); - ec_cmd->scsi_status =SAM_STAT_CHECK_CONDITION ; +/* +* Don't override an error scsi status if it has already been set +*/ +if (ec_cmd->scsi_status ==SAM_STAT_GOOD ) { +pr_warn_ratelimited ("target_xcopy_do_work: rc: %d, Setting X-COPY" +" CHECK_CONDITION -> sending response\n" , rc); + ec_cmd->scsi_status =SAM_STAT_CHECK_CONDITION ; + }target_complete_cmd (ec_cmd,SAM_STAT_CHECK_CONDITION ); }
@@ -875,7 +893,7 @@ sense_reason_t target_do_xcopy(struct se_cmd *se_cmd)" tdll: %hu sdll: %u inline_dl: %u\n" , list_id, list_id_usage, tdll, sdll, inline_dl); - rc =target_xcopy_parse_target_descriptors (se_cmd, xop, &p[16 ], tdll); + rc =target_xcopy_parse_target_descriptors (se_cmd, xop, &p[16 ], tdll, &ret);if (rc <=0 ) goto out;
drivers/video/fbdev/efifb.c +3 -3
@@ -52,9 +52,9 @@ static int efifb_setcolreg(unsigned regno, unsigned red, unsigned green,return 1 ;if (regno <16 ) { - red >>=8 ; - green >>=8 ; - blue >>=8 ; + red >>=16 - info->var.red.length; + green >>=16 - info->var.green.length; + blue >>=16 - info->var.blue.length; ((u32 *)(info->pseudo_palette))[regno] = (red << info->var.red.offset) | (green << info->var.green.offset) |
fs/ceph/file.c +2 -1
@@ -929,7 +929,8 @@ again: statret =__ceph_do_getattr (inode, page,CEPH_STAT_CAP_INLINE_DATA , !!page);if (statret <0 ) { -__free_page (page); +if (page) +__free_page (page);if (statret == -ENODATA ) {BUG_ON (retry_op !=READ_INLINE ); goto again;
fs/cifs/cifs_debug.c +15 -42
140 lines not on this page · raw message
fs/cifs/cifs_debug.h +1 -1
@@ -25,7 +25,7 @@void cifs_dump_mem (char *label,void *data,int length);void cifs_dump_detail (void *);void cifs_dump_mids (struct TCP_Server_Info *); -extern int traceSMB;/* flag which enables the function below */ +extern bool traceSMB;/* flag which enables the function below */ void dump_smb (void *,int );#define CIFS_INFO 0x01#define CIFS_RC 0x02
fs/cifs/cifsfs.c +4 -5
@@ -54,10 +54,10 @@#endif int cifsFYI =0 ; -int traceSMB =0 ; +bool traceSMB;bool enable_oplocks = true; -unsigned int linuxExtEnabled =1 ; -unsigned int lookupCacheEnabled =1 ; +bool linuxExtEnabled = true; +bool lookupCacheEnabled = true;unsigned int global_secflags =CIFSSEC_DEF ;/* unsigned int ntlmv2_support = 0; */ unsigned int sign_CIFS_PDUs =1 ;
@@ -268,7 +268,7 @@ cifs_alloc_inode(struct super_block *sb) cifs_inode->createtime =0 ; cifs_inode->epoch =0 ;#ifdef CONFIG_CIFS_SMB2 -get_random_bytes (cifs_inode->lease_key,SMB2_LEASE_KEY_SIZE ); +generate_random_uuid (cifs_inode->lease_key);#endif /* * Can not set i_flags here - they get immediately overwritten to zero
@@ -1210,7 +1210,6 @@ init_cifs(void) GlobalTotalActiveXid =0 ; GlobalMaxActiveXid =0 ;spin_lock_init (&cifs_tcp_ses_lock); -spin_lock_init (&cifs_file_list_lock);spin_lock_init (&GlobalMid_Lock);if (cifs_max_pending <2 ) {
fs/cifs/cifsglob.h +17 -17
@@ -827,6 +827,7 @@ struct cifs_tcon {struct list_head tcon_list;int tc_count;struct list_head openFileList; +spinlock_t open_file_lock;/* protects list above */ struct cifs_ses *ses;/* pointer to session associated with */ char treeName[MAX_TREE_SIZE +1 ];/* UNC name of resource in ASCII */ char *nativeFileSystem;
@@ -883,7 +884,7 @@ struct cifs_tcon {#endif /* CONFIG_CIFS_STATS2 */ __u64 bytes_read;__u64 bytes_written; -spinlock_t stat_lock; +spinlock_t stat_lock;/* protects the two fields above */ #endif /* CONFIG_CIFS_STATS */ FILE_SYSTEM_DEVICE_INFO fsDevInfo;FILE_SYSTEM_ATTRIBUTE_INFO fsAttrInfo;/* ok if fs name truncated */
@@ -1034,8 +1035,10 @@ struct cifs_fid_locks { };struct cifsFileInfo { +/* following two lists are protected by tcon->open_file_lock */ struct list_head tlist;/* pointer to next fid owned by tcon */ struct list_head flist;/* next fid (file instance) for this inode */ +/* lock list below protected by cifsi->lock_sem */ struct cifs_fid_locks *llist;/* brlocks held by this fid */ kuid_t uid;/* allows finding which FileInfo structure */ __u32 pid;/* process id who opened file */
@@ -1043,11 +1046,12 @@ struct cifsFileInfo {/* BB add lock scope info here if needed */ ;/* lock scope id (0 if none) */ struct dentry *dentry; -unsigned int f_flags;struct tcon_link *tlink; +unsigned int f_flags; bool invalidHandle:1; /* file closed via session abend */ bool oplock_break_cancelled:1; -int count;/* refcount protected by cifs_file_list_lock */ +int count; +spinlock_t file_info_lock;/* protects four flag/count fields above */ struct mutex fh_mutex;/* prevents reopen race after dead ses*/ struct cifs_search_info srch_inf;struct work_struct oplock_break;/* work for oplock breaks */
@@ -1114,7 +1118,7 @@ struct cifs_writedata {/* * Take a reference on the file private data. Must be called with -* cifs_file_list_lock held. +* cfile->file_info_lock held. */ static inline void cifsFileInfo_get_locked (struct cifsFileInfo *cifs_file)
@@ -1508,8 +1512,10 @@ require use of the stronger protocol */* GlobalMid_Lock protects: * list operations on pending_mid_q and oplockQ * updates to XID counters, multiplex id and SMB sequence numbers -* cifs_file_list_lock protects: -* list operations on tcp and SMB session lists and tCon lists +* tcp_ses_lock protects: +* list operations on tcp and SMB session lists +* tcon->open_file_lock protects the list of open files hanging off the tcon +* cfile->file_info_lock protects counters and fields in cifs file struct * f_owner.lock protects certain per file struct operations * mapping->page_lock protects certain per page operations *
@@ -1541,18 +1547,12 @@ GLOBAL_EXTERN struct list_head cifs_tcp_ses_list;* tcp session, and the list of tcon's per smb session. It also protects * the reference counters for the server, smb session, and tcon. Finally, * changes to the tcon->tidStatus should be done while holding this lock. +* generally the locks should be taken in order tcp_ses_lock before +* tcon->open_file_lock and that before file->file_info_lock since the +* structure order is cifs_socket-->cifs_ses-->cifs_tcon-->cifs_file */ GLOBAL_EXTERN spinlock_t cifs_tcp_ses_lock; -/* -* This lock protects the cifs_file->llist and cifs_file->flist -* list operations, and updates to some flags (cifs_file->invalidHandle) -* It will be moved to either use the tcon->stat_lock or equivalent later. -* If cifs_tcp_ses_lock and the lock below are both needed to be held, then -* the cifs_tcp_ses_lock must be grabbed first and released last. -*/ -GLOBAL_EXTERN spinlock_t cifs_file_list_lock; -#ifdef CONFIG_CIFS_DNOTIFY_EXPERIMENTAL /* unused temporarily */ /* Outstanding dir notify requests */ GLOBAL_EXTERN struct list_head GlobalDnotifyReqList;
@@ -1588,11 +1588,11 @@ GLOBAL_EXTERN atomic_t midCount;/* Misc globals */ GLOBAL_EXTERN bool enable_oplocks; /* enable or disable oplocks */ -GLOBAL_EXTERN unsigned int lookupCacheEnabled; +GLOBAL_EXTERN bool lookupCacheEnabled; GLOBAL_EXTERN unsigned int global_secflags; /* if on, session setup sentwith more secure ntlmssp2 challenge/resp */ GLOBAL_EXTERN unsigned int sign_CIFS_PDUs; /* enable smb packet signing */ -GLOBAL_EXTERN unsigned int linuxExtEnabled;/*enable Linux/Unix CIFS extensions*/ +GLOBAL_EXTERN bool linuxExtEnabled;/*enable Linux/Unix CIFS extensions*/ GLOBAL_EXTERN unsigned int CIFSMaxBufSize; /* max size not including hdr */ GLOBAL_EXTERN unsigned int cifs_min_rcv; /* min size of big ntwrk buf pool */ GLOBAL_EXTERN unsigned int cifs_min_small; /* min size of small buf pool */
fs/cifs/cifssmb.c +2 -2
@@ -98,13 +98,13 @@ cifs_mark_open_files_invalid(struct cifs_tcon *tcon)struct list_head *tmp1;/* list all files open on tree connection and mark them invalid */ -spin_lock (&cifs_file_list_lock); +spin_lock (&tcon->open_file_lock);list_for_each_safe (tmp, tmp1, &tcon->openFileList) { open_file = list_entry(tmp, struct cifsFileInfo, tlist); open_file->invalidHandle = true; open_file->oplock_break_cancelled = true; } -spin_unlock (&cifs_file_list_lock); +spin_unlock (&tcon->open_file_lock);/* * BB Add call to invalidate_inodes(sb) for all superblocks mounted * to this tcon.
fs/cifs/connect.c +9 -7
@@ -2200,7 +2200,7 @@ cifs_get_tcp_session(struct smb_vol *volume_info)memcpy (&tcp_ses->dstaddr, &volume_info->dstaddr,sizeof (tcp_ses->dstaddr));#ifdef CONFIG_CIFS_SMB2 -get_random_bytes (tcp_ses->client_guid,SMB2_CLIENT_GUID_SIZE ); +generate_random_uuid (tcp_ses->client_guid);#endif /* * at this point we are the only ones with the pointer
@@ -3693,14 +3693,16 @@ remote_path_check: goto mount_fail_check; } - rc =cifs_are_all_path_components_accessible (server, +if (rc != -EREMOTE ) { + rc =cifs_are_all_path_components_accessible (server, xid, tcon, cifs_sb, full_path); -if (rc !=0 ) { -cifs_dbg (VFS ,"cannot query dirs between root and final path, " -"enabling CIFS_MOUNT_USE_PREFIX_PATH\n" ); - cifs_sb->mnt_cifs_flags |=CIFS_MOUNT_USE_PREFIX_PATH ; - rc =0 ; +if (rc !=0 ) { +cifs_dbg (VFS ,"cannot query dirs between root and final path, " +"enabling CIFS_MOUNT_USE_PREFIX_PATH\n" ); + cifs_sb->mnt_cifs_flags |=CIFS_MOUNT_USE_PREFIX_PATH ; + rc =0 ; + } }kfree (full_path); }
fs/cifs/file.c +39 -27
210 lines not on this page · raw message
fs/cifs/misc.c +8 -7
@@ -120,6 +120,7 @@ tconInfoAlloc(void) ++ret_buf->tc_count;INIT_LIST_HEAD (&ret_buf->openFileList);INIT_LIST_HEAD (&ret_buf->tcon_list); +spin_lock_init (&ret_buf->open_file_lock);#ifdef CONFIG_CIFS_STATS spin_lock_init (&ret_buf->stat_lock);#endif
@@ -465,7 +466,7 @@ is_valid_oplock_break(char *buffer, struct TCP_Server_Info *srv)continue ;cifs_stats_inc (&tcon->stats.cifs_stats.num_oplock_brks); -spin_lock (&cifs_file_list_lock); +spin_lock (&tcon->open_file_lock);list_for_each (tmp2, &tcon->openFileList) { netfile = list_entry(tmp2, struct cifsFileInfo, tlist);
@@ -495,11 +496,11 @@ is_valid_oplock_break(char *buffer, struct TCP_Server_Info *srv) &netfile->oplock_break); netfile->oplock_break_cancelled = false; -spin_unlock (&cifs_file_list_lock); +spin_unlock (&tcon->open_file_lock);spin_unlock (&cifs_tcp_ses_lock);return true; } -spin_unlock (&cifs_file_list_lock); +spin_unlock (&tcon->open_file_lock);spin_unlock (&cifs_tcp_ses_lock);cifs_dbg (FYI ,"No matching file for oplock break\n" );return true;
@@ -613,9 +614,9 @@ backup_cred(struct cifs_sb_info *cifs_sb)void cifs_del_pending_open (struct cifs_pending_open *open) { -spin_lock (&cifs_file_list_lock); +spin_lock (&tlink_tcon (open->tlink)->open_file_lock);list_del (&open->olist); -spin_unlock (&cifs_file_list_lock); +spin_unlock (&tlink_tcon (open->tlink)->open_file_lock); }void
@@ -635,7 +636,7 @@ void cifs_add_pending_open(struct cifs_fid *fid, struct tcon_link *tlink, struct cifs_pending_open *open) { - spin_lock(&cifs_file_list_lock); + spin_lock(&tlink_tcon(tlink)->open_file_lock);cifs_add_pending_open_locked (fid, tlink, open); -spin_unlock (&cifs_file_list_lock); +spin_unlock (&tlink_tcon (open->tlink)->open_file_lock); }
fs/cifs/readdir.c +3 -3
@@ -594,14 +594,14 @@ find_cifs_entry(const unsigned int xid, struct cifs_tcon *tcon, loff_t pos, is_dir_changed(file)) || (index_to_find < first_entry_in_buffer)) {/* close and restart search */ cifs_dbg (FYI ,"search backing up - close and restart search\n" ); -spin_lock (&cifs_file_list_lock); +spin_lock (&cfile->file_info_lock);if (server->ops->dir_needs_close (cfile)) { cfile->invalidHandle = true; -spin_unlock (&cifs_file_list_lock); +spin_unlock (&cfile->file_info_lock);if (server->ops->close_dir) server->ops->close_dir (xid, tcon, &cfile->fid); }else -spin_unlock (&cifs_file_list_lock); +spin_unlock (&cfile->file_info_lock);if (cfile->srch_inf.ntwrk_buf_start) {cifs_dbg (FYI ,"freeing SMB ff cache buf on search rewind\n" );if (cfile->srch_inf.smallBuf)
fs/cifs/smb2glob.h +10 -0
@@ -61,4 +61,14 @@/* Maximum buffer size value we can send with 1 credit */ #define SMB2_MAX_BUFFER_SIZE 65536 +/* +* Maximum number of credits to keep available. +* This value is chosen somewhat arbitrarily. The Windows client +* defaults to 128 credits, the Windows server allows clients up to +* 512 credits, and the NetApp server does not limit clients at all. +* Choose a high enough value such that the client shouldn't limit +* performance. +*/ +#define SMB2_MAX_CREDITS_AVAILABLE 32000 +#endif /* _SMB2_GLOB_H */
fs/cifs/smb2inode.c +6 -0
@@ -266,9 +266,15 @@ smb2_set_file_info(struct inode *inode, const char *full_path,struct tcon_link *tlink;int rc; +if ((buf->CreationTime ==0 ) && (buf->LastAccessTime ==0 ) && + (buf->LastWriteTime ==0 ) && (buf->ChangeTime) && + (buf->Attributes ==0 )) +return 0 ;/* would be a no op, no sense sending this */ + tlink =cifs_sb_tlink (cifs_sb);if (IS_ERR (tlink))return PTR_ERR (tlink); + rc =smb2_open_op_close (xid,tlink_tcon (tlink), cifs_sb, full_path,FILE_WRITE_ATTRIBUTES ,FILE_OPEN ,0 , buf,SMB2_OP_SET_INFO );
fs/cifs/smb2misc.c +8 -8
@@ -525,19 +525,19 @@ smb2_is_valid_lease_break(char *buffer)list_for_each (tmp1, &server->smb_ses_list) { ses = list_entry(tmp1, struct cifs_ses, smb_ses_list); -spin_lock (&cifs_file_list_lock);list_for_each (tmp2, &ses->tcon_list) { tcon = list_entry(tmp2, struct cifs_tcon, tcon_list); +spin_lock (&tcon->open_file_lock);cifs_stats_inc ( &tcon->stats.cifs_stats.num_oplock_brks);if (smb2_tcon_has_lease (tcon, rsp, lw)) { -spin_unlock (&cifs_file_list_lock); +spin_unlock (&tcon->open_file_lock);spin_unlock (&cifs_tcp_ses_lock);return true; } +spin_unlock (&tcon->open_file_lock); } -spin_unlock (&cifs_file_list_lock); } }spin_unlock (&cifs_tcp_ses_lock);
@@ -579,7 +579,7 @@ smb2_is_valid_oplock_break(char *buffer, struct TCP_Server_Info *server) tcon = list_entry(tmp1, struct cifs_tcon, tcon_list);cifs_stats_inc (&tcon->stats.cifs_stats.num_oplock_brks); -spin_lock (&cifs_file_list_lock); +spin_lock (&tcon->open_file_lock);list_for_each (tmp2, &tcon->openFileList) { cfile = list_entry(tmp2, struct cifsFileInfo, tlist);
@@ -591,7 +591,7 @@ smb2_is_valid_oplock_break(char *buffer, struct TCP_Server_Info *server)cifs_dbg (FYI ,"file id match, oplock break\n" ); cinode =CIFS_I (d_inode (cfile->dentry)); - +spin_lock (&cfile->file_info_lock);if (!CIFS_CACHE_WRITE (cinode) && rsp->OplockLevel ==SMB2_OPLOCK_LEVEL_NONE ) cfile->oplock_break_cancelled = true;
@@ -613,14 +613,14 @@ smb2_is_valid_oplock_break(char *buffer, struct TCP_Server_Info *server)clear_bit (CIFS_INODE_DOWNGRADE_OPLOCK_TO_L2 , &cinode->flags); - +spin_unlock (&cfile->file_info_lock);queue_work (cifsiod_wq, &cfile->oplock_break); -spin_unlock (&cifs_file_list_lock); +spin_unlock (&tcon->open_file_lock);spin_unlock (&cifs_tcp_ses_lock);return true; } -spin_unlock (&cifs_file_list_lock); +spin_unlock (&tcon->open_file_lock);spin_unlock (&cifs_tcp_ses_lock);cifs_dbg (FYI ,"No matching file for oplock break\n" );return true;
fs/cifs/smb2ops.c +6 -6
@@ -282,7 +282,7 @@ SMB3_request_interfaces(const unsigned int xid, struct cifs_tcon *tcon)cifs_dbg (FYI ,"Link Speed %lld\n" , le64_to_cpu(out_buf->LinkSpeed)); } - +kfree (out_buf);return rc; }#endif /* STATS2 */
@@ -536,6 +536,7 @@ smb2_set_fid(struct cifsFileInfo *cfile, struct cifs_fid *fid, __u32 oplock) server->ops->set_oplock_level (cinode, oplock, fid->epoch, &fid->purge_cache); cinode->can_cache_brlcks =CIFS_CACHE_WRITE (cinode); +memcpy (cfile->fid.create_guid, fid->create_guid,16 ); } static void
@@ -694,6 +695,7 @@ smb2_clone_range(const unsigned int xid, cchunk_out:kfree (pcchunk); +kfree (retbuf);return rc; }
@@ -818,7 +820,6 @@ smb2_duplicate_extents(const unsigned int xid, {int rc;unsigned int ret_data_len; -char *retbuf =NULL ;struct duplicate_extents_to_file dup_ext_buf;struct cifs_tcon *tcon =tlink_tcon (trgtfile->tlink);
@@ -844,7 +845,7 @@ smb2_duplicate_extents(const unsigned int xid,FSCTL_DUPLICATE_EXTENTS_TO_FILE , true/* is_fsctl */ , (char *)&dup_ext_buf,sizeof (struct duplicate_extents_to_file ), - (char **)&retbuf, +NULL , &ret_data_len);if (ret_data_len >0 )
@@ -867,7 +868,6 @@ smb3_set_integrity(const unsigned int xid, struct cifs_tcon *tcon, struct cifsFileInfo *cfile) {struct fsctl_set_integrity_information_req integr_info; -char *retbuf =NULL ;unsigned int ret_data_len; integr_info.ChecksumAlgorithm =cpu_to_le16 (CHECKSUM_TYPE_UNCHANGED );
@@ -879,7 +879,7 @@ smb3_set_integrity(const unsigned int xid, struct cifs_tcon *tcon,FSCTL_SET_INTEGRITY_INFORMATION , true/* is_fsctl */ , (char *)&integr_info,sizeof (struct fsctl_set_integrity_information_req ), - (char **)&retbuf, +NULL , &ret_data_len); }
@@ -1036,7 +1036,7 @@ smb2_set_lease_key(struct inode *inode, struct cifs_fid *fid)static void smb2_new_lease_key (struct cifs_fid *fid) { -get_random_bytes (fid->lease_key,SMB2_LEASE_KEY_SIZE ); +generate_random_uuid (fid->lease_key); }#define SMB2_SYMLINK_STRUCT_SIZE \
fs/cifs/smb2pdu.c +23 -2
@@ -103,7 +103,21 @@ smb2_hdr_assemble(struct smb2_hdr *hdr, __le16 smb2_cmd /* command */ , hdr->ProtocolId[3 ] ='B' ; hdr->StructureSize =cpu_to_le16 (64 ); hdr->Command = smb2_cmd; - hdr->CreditRequest =cpu_to_le16 (2 );/* BB make this dynamic */ +if (tcon && tcon->ses && tcon->ses->server) { +struct TCP_Server_Info *server = tcon->ses->server; + +spin_lock (&server->req_lock); +/* Request up to 2 credits but don't go over the limit. */ +if (server->credits >=SMB2_MAX_CREDITS_AVAILABLE ) + hdr->CreditRequest =cpu_to_le16 (0 ); +else + hdr->CreditRequest =cpu_to_le16 ( +min_t (int,SMB2_MAX_CREDITS_AVAILABLE - + server->credits,2 )); +spin_unlock (&server->req_lock); + }else { + hdr->CreditRequest =cpu_to_le16 (2 ); + } hdr->ProcessId =cpu_to_le32 ((__u16 )current->tgid);if (!tcon)
@@ -593,6 +607,7 @@ SMB2_sess_setup(const unsigned int xid, struct cifs_ses *ses,char *security_blob =NULL ;unsigned char *ntlmssp_blob =NULL ;bool use_spnego = false;/* else use raw ntlmssp */ +u64 previous_session = ses->Suid;cifs_dbg (FYI ,"Session Setup\n" );
@@ -630,6 +645,10 @@ ssetup_ntlmssp_authenticate:return rc; req->hdr.SessionId =0 ;/* First session, not a reauthenticate */ + +/* if reconnect, we need to send previous sess id, otherwise it is 0 */ + req->PreviousSessionId = previous_session; + req->Flags =0 ;/* MBZ */ /* to enable echos and oplocks */ req->hdr.CreditRequest =cpu_to_le16 (3 );
@@ -1167,7 +1186,7 @@ create_durable_v2_buf(struct cifs_fid *pfid) buf->dcontext.Timeout =0 ;/* Should this be configurable by workload */ buf->dcontext.Flags =cpu_to_le32 (SMB2_DHANDLE_FLAG_PERSISTENT ); -get_random_bytes (buf->dcontext.CreateGuid,16 ); +generate_random_uuid (buf->dcontext.CreateGuid);memcpy (pfid->create_guid, buf->dcontext.CreateGuid,16 );/* SMB2_CREATE_DURABLE_HANDLE_REQUEST is "DH2Q" */
@@ -2059,6 +2078,7 @@ smb2_async_readv(struct cifs_readdata *rdata)if (rdata->credits) { buf->CreditCharge =cpu_to_le16 (DIV_ROUND_UP (rdata->bytes,SMB2_MAX_BUFFER_SIZE )); + buf->CreditRequest = buf->CreditCharge;spin_lock (&server->req_lock); server->credits += rdata->credits -le16_to_cpu (buf->CreditCharge);
@@ -2245,6 +2265,7 @@ smb2_async_writev(struct cifs_writedata *wdata,if (wdata->credits) { req->hdr.CreditCharge =cpu_to_le16 (DIV_ROUND_UP (wdata->bytes,SMB2_MAX_BUFFER_SIZE )); + req->hdr.CreditRequest = req->hdr.CreditCharge;spin_lock (&server->req_lock); server->credits += wdata->credits -le16_to_cpu (req->hdr.CreditCharge);
fs/cifs/smb2pdu.h +1 -1
@@ -276,7 +276,7 @@ struct smb2_sess_setup_req {__le32 Channel;__le16 SecurityBufferOffset;__le16 SecurityBufferLength; -__le64 PreviousSessionId; +__u64 PreviousSessionId;__u8 Buffer[1 ];/* variable length GSS security buffer */ } __packed;
fs/ext4/sysfs.c +4 -0
@@ -223,14 +223,18 @@ static struct attribute *ext4_attrs[] = {EXT4_ATTR_FEATURE (lazy_itable_init);EXT4_ATTR_FEATURE (batched_discard);EXT4_ATTR_FEATURE (meta_bg_resize); +#ifdef CONFIG_EXT4_FS_ENCRYPTION EXT4_ATTR_FEATURE (encryption); +#endif EXT4_ATTR_FEATURE (metadata_csum_seed);static struct attribute *ext4_feat_attrs[] = {ATTR_LIST (lazy_itable_init),ATTR_LIST (batched_discard),ATTR_LIST (meta_bg_resize), +#ifdef CONFIG_EXT4_FS_ENCRYPTIONATTR_LIST (encryption), +#endifATTR_LIST (metadata_csum_seed),NULL , };
fs/isofs/inode.c +5 -3
@@ -690,6 +690,11 @@ static int isofs_fill_super(struct super_block *s, void *data, int silent) pri_bh =NULL ; root_found: +/* We don't support read-write mounts */ +if (!(s->s_flags &MS_RDONLY )) { + error = -EACCES ; + goto out_freebh; + }if (joliet_level && (pri ==NULL || !opt.rock)) {/* This is the case of Joliet with the norock mount flag.
@@ -1503,9 +1508,6 @@ struct inode *__isofs_iget(struct super_block *sb,static struct dentry *isofs_mount (struct file_system_type *fs_type,int flags,const char *dev_name,void *data) { -/* We don't support read-write mounts */ -if (!(flags &MS_RDONLY )) -return ERR_PTR (-EACCES );return mount_bdev (fs_type, flags, dev_name, data, isofs_fill_super); }
fs/jbd2/transaction.c +2 -1
@@ -1156,6 +1156,7 @@ int jbd2_journal_get_create_access(handle_t *handle, struct buffer_head *bh)JBUFFER_TRACE (jh,"file as BJ_Reserved" );spin_lock (&journal->j_list_lock);__jbd2_journal_file_buffer (jh, transaction, BJ_Reserved); +spin_unlock (&journal->j_list_lock); }else if (jh->b_transaction == journal->j_committing_transaction) {/* first access by this transaction */ jh->b_modified =0 ;
@@ -1163,8 +1164,8 @@ int jbd2_journal_get_create_access(handle_t *handle, struct buffer_head *bh)JBUFFER_TRACE (jh,"set next transaction" );spin_lock (&journal->j_list_lock); jh->b_next_transaction = transaction; +spin_unlock (&journal->j_list_lock); } -spin_unlock (&journal->j_list_lock);jbd_unlock_bh_state (bh);/*
fs/nfs/delegation.c +13 -3
@@ -41,6 +41,17 @@ void nfs_mark_delegation_referenced(struct nfs_delegation *delegation)set_bit (NFS_DELEGATION_REFERENCED , &delegation->flags); } +static bool +nfs4_is_valid_delegation (const struct nfs_delegation *delegation, +fmode_t flags) +{ +if (delegation !=NULL && (delegation->type & flags) == flags && + !test_bit (NFS_DELEGATION_REVOKED , &delegation->flags) && + !test_bit (NFS_DELEGATION_RETURNING , &delegation->flags)) +return true; +return false; +} +static int nfs4_do_check_delegation (struct inode *inode,fmode_t flags,bool mark) {
@@ -50,8 +61,7 @@ nfs4_do_check_delegation(struct inode *inode, fmode_t flags, bool mark) flags &=FMODE_READ |FMODE_WRITE ;rcu_read_lock (); delegation =rcu_dereference (NFS_I (inode)->delegation); -if (delegation !=NULL && (delegation->type & flags) == flags && - !test_bit (NFS_DELEGATION_RETURNING , &delegation->flags)) { +if (nfs4_is_valid_delegation (delegation, flags)) {if (mark)nfs_mark_delegation_referenced (delegation); ret =1 ;
@@ -892,7 +902,7 @@ bool nfs4_copy_delegation_stateid(nfs4_stateid *dst, struct inode *inode, flags &=FMODE_READ |FMODE_WRITE ;rcu_read_lock (); delegation =rcu_dereference (nfsi->delegation); - ret = (delegation !=NULL && (delegation->type & flags) == flags); + ret =nfs4_is_valid_delegation (delegation, flags);if (ret) {nfs4_stateid_copy (dst, &delegation->stateid);nfs_mark_delegation_referenced (delegation);
fs/nfs/nfs42proc.c +1 -0
@@ -269,6 +269,7 @@ int nfs42_proc_layoutstats_generic(struct nfs_server *server, task =rpc_run_task (&task_setup);if (IS_ERR (task))return PTR_ERR (task); +rpc_put_task (task);return 0 ; }
fs/nfs/nfs4state.c +3 -0
@@ -1493,6 +1493,9 @@ restart: __func__, status);case -ENOENT :case -ENOMEM : +case -EACCES : +case -EROFS : +case -EIO :case -ESTALE :/* Open state on this file cannot be recovered */ nfs4_state_mark_recovery_failed (state, status);
fs/overlayfs/copy_up.c +11 -1
@@ -25,6 +25,7 @@ int ovl_copy_xattr(struct dentry *old, struct dentry *new)ssize_t list_size, size, value_size =0 ;char *buf, *name, *value =NULL ;int uninitialized_var (error );
Lines of this file are not shown. View the raw message.
fs/pstore/ram_core.c +5 -44
49 lines not on this page · raw message
include/linux/lightnvm.h +64 -57
121 lines not on this page · raw message
ipc/sem.c +75 -55
130 lines not on this page · raw message
lib/kstrtox.c +64 -0
64 lines not on this page · raw message
mm/filemap.c +51 -44
95 lines not on this page · raw message
tools/perf/util/intel-pt-decoder/intel-pt-decoder.c +38 -0
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.