Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync up with Linus #42

Merged
merged 226 commits into from
Feb 23, 2015
Merged
Changes from 1 commit
Commits
Show all changes
226 commits
Select commit Hold shift + click to select a range
49c21e1
ovl: check whiteout while reading directory
Dec 12, 2014
1afaba1
ovl: make path-type a bitmap
Dec 12, 2014
263b4a0
ovl: dont replace opaque dir
Dec 12, 2014
dd66266
ovl: add mutli-layer infrastructure
Dec 12, 2014
5ef88da
ovl: helper to iterate layers
Dec 12, 2014
9d7459d
ovl: multi-layer readdir
Dec 12, 2014
3d3c6b8
ovl: multi-layer lookup
Dec 12, 2014
3e01cee
ovl: check whiteout on lowest layer as well
Dec 12, 2014
09e1032
ovl: lookup ENAMETOOLONG on lower means ENOENT
Dec 12, 2014
4ebc581
ovl: allow statfs if no upper layer
Dec 12, 2014
3b7a9a2
ovl: mount: change order of initialization
Dec 12, 2014
ab50882
ovl: improve mount helpers
Dec 12, 2014
53a08cb
ovl: make upperdir optional
Dec 12, 2014
a78d9f0
ovl: support multiple lower layers
Dec 12, 2014
1ba3872
ovl: Cleanup redundant blank lines
Nov 26, 2014
cead89b
ovl: Use macros to present ovl_xattr
Nov 24, 2014
2b7a8f3
ovl: add testsuite to docs
Dec 12, 2014
2f83fd8
ovl: Fix kernel panic while mounting overlayfs
Jan 6, 2015
a425c03
ovl: Fix opaque regression in ovl_lookup
Jan 6, 2015
3cdf6fe
ovl: Prevent rw remount when it should be ro mount
earlbread Jan 2, 2015
6d900f5
ovl: document lower layer ordering
Jan 8, 2015
4330397
ovl: discard independent cursor in readdir()
Dec 11, 2014
d0f0f63
MIPS: Rewrite csum_fold to plain C.
ralfbaechle Dec 17, 2014
b4b5015
MIPS: Use <asm-generic/checksum.h>
ralfbaechle Dec 17, 2014
2f26c48
MIPS: Use generic csum_tcpudp_magic for MIPS.
ralfbaechle Dec 17, 2014
7f84c0a
MIPS: ARC: Use __noreturn / unreachable in ARC termination functions.
ralfbaechle Jan 2, 2015
efc46d1
MIPS: IP32: Use __noreturn instead of open coded attributes in declar…
ralfbaechle Jan 2, 2015
dd6e2db
MIPS: IP27: Use __noreturn instead of open coded attributes in declar…
ralfbaechle Jan 2, 2015
bb03006
MIPS: ARC: Use __noreturn instead of open coded attributes in declara…
ralfbaechle Jan 2, 2015
e950324
MIPS: ARC: Add declarations for a few missing ARC firmware functions.
ralfbaechle Jan 2, 2015
250215c
MIPS: Remove unused dt_setup_arch()
geertu Jan 12, 2015
7b09777
MIPS: Add struct pci_ops member names to initialization
robherring Jan 10, 2015
b692422
jbd2: complain about descriptor block checksum errors
djwong Jan 19, 2015
3edc18d
ext4: reserve codepoints used by the ext4 encryption feature
tytso Jan 19, 2015
04ecddb
ext4: change to use setup_timer() instead of init_timer()
yaqwsx Jan 26, 2015
2d76e96
MIPS: elf2ecoff: Fix warning due to dead code.
ralfbaechle Feb 4, 2015
ae58d88
MIPS: cevt-r4k: Drop GIC special case
Jan 19, 2015
bd07586
am53c974: remove left-over debugging code
hreinecke Feb 2, 2015
3bd746c
fcoe: Transition maintainership to Vasu
May 28, 2014
d8ba1f9
NFSv4.1: Fix a kfree() of uninitialised pointers in decode_cb_sequenc…
trondmypd Feb 11, 2015
a4f743a
NFSv4.1: Convert open-coded array allocation calls to kmalloc_array()
trondmypd Feb 11, 2015
9791554
MIPS,prctl: add PR_[GS]ET_FP_MODE prctl options for MIPS
paulburton Jan 8, 2015
54d7e72
SUNRPC: Fix a compile error when #undef CONFIG_PROC_FS
trondmypd Feb 12, 2015
2cb5cc8
ext4: support read-only images
djwong Feb 13, 2015
0572639
ext4: fix mmap data corruption in nodelalloc mode when blocksize < pa…
wangxiaoguang Feb 13, 2015
b94a8b3
ext4: remove duplicate remount check for JOURNAL_CHECKSUM change
Feb 13, 2015
2d5b86e
ext4: ignore journal checksum on remount; don't fail
Feb 13, 2015
813b00d
SUNRPC: Always manipulate rpc_rqst::rq_bc_pa_list under xprt->bc_pa_lock
chucklever Feb 13, 2015
d15bc38
nfs: Provide and use helper functions for marking a page as unstable
Feb 13, 2015
487b9b8
nfs: Can call nfs_clear_page_commit() instead
Feb 13, 2015
f4086a3
NFS: struct nfs_commit_info.lock must always point to inode->i_lock
trondmypd Feb 14, 2015
bf40e55
NFSv4: Kill unused nfs_inode->delegation_state field
trondmypd Feb 14, 2015
6f30b7e
ext4: fix indirect punch hole corruption
osandov Feb 15, 2015
f76a610
fixed invalid assignment of 64bit mask to host dma_boundary for scatt…
Feb 9, 2015
397ea9c
hpsa: correct compiler warnings introduced by hpsa-add-local-workqueu…
Feb 6, 2015
2ecf8e0
wd719x: add missing .module to wd719x_template
Feb 9, 2015
3b524a6
sg: fix read() error reporting
abattersby Feb 11, 2015
5278511
xfs: implement pNFS export operations
Feb 16, 2015
781355c
xfs: recall pNFS layouts on conflicting access
Feb 16, 2015
d79d853
MIPS: mm: Add debug information for userland SIGSEGV signals.
Jan 21, 2015
461d159
MIPS: asm: pgtable: Add c0 hazards on HTW start/stop sequences
Jan 26, 2015
fde3538
MIPS: asm: pgtable: Prevent HTW race when updating PTEs
Jan 26, 2015
b3e76c4
MIPS: Makefile: Move the ASEs checks after setting the core's CFLAGS
Feb 2, 2015
ed4cbc8
MIPS: HTW: Prevent accidental HTW start due to nested htw_{start, stop}
Jan 26, 2015
aca5721
MIPS: Add generic QEMU PRid and cpu type identifiers
Oct 27, 2014
4695089
MIPS: Add cases for CPU_QEMU_GENERIC
Nov 24, 2014
b2498af
MIPS: Add MIPS generic QEMU probe support
Nov 24, 2014
7fd08ca
MIPS: Add build support for the MIPS R6 ISA
Oct 27, 2014
51eec48
MIPS: mm: uasm: Add signed 9-bit immediate related macros
Nov 18, 2014
a168b8f
MIPS: mm: Add MIPS R6 instruction encodings
Nov 19, 2014
9df1182
ARM: dts: BCM63xx: fix L2 cache properties
ffainelli Feb 11, 2015
b51c05a
ARM: dts: add I2C device nodes for Broadcom Cygnus
Dec 9, 2014
7568615
sg: fix unkillable I/O wait deadlock with scsi-mq
abattersby Feb 13, 2015
7772855
sg: fix EWOULDBLOCK errors with scsi-mq
abattersby Feb 13, 2015
be51369
MIPS: asm: compiler: Add new macros to set ISA and arch asm annotations
Nov 18, 2014
b840a82
MIPS: asm: module: define MODULE_PROC_FAMILY for MIPS R6
Oct 27, 2014
6a0e986
MIPS: asm: stackframe: Do not preserve the HI/LO registers on MIPS R6
Oct 27, 2014
226da55
MIPS: asm: asmmacro: Add MIPS R6 support to the simple EI/DI variants
Nov 5, 2014
98a833c
MIPS: asm: asmmacro: Replace "add" instructions with "addu"
Nov 5, 2014
4e0748f
MIPS: Use generic checksum functions for MIPS R6
Nov 13, 2014
34c56fc
MIPS: asm: cpu: Add MIPSR6 ISA definitions
Nov 13, 2014
f52fca9
MIPS: asm: hazards: Add MIPSR6 definitions
Nov 13, 2014
8716a76
MIPS: asm: irqflags: Add MIPS R6 related definitions
Nov 13, 2014
934c792
MIPS: asm: r4kcache: Add MIPS R6 cache unroll functions
Nov 13, 2014
a7e07b1
MIPS: asm: spram: Add new symbol for MIPS scratch pad storage
Nov 13, 2014
94bfb75
MIPS: asm: Rename GCC_OFF12_ASM to GCC_OFF_SMALL_ASM
Jan 26, 2015
123e4b3
MIPS: Use the new "ZC" constraint for MIPS R6
Dec 19, 2014
fa998eb
MIPS: asm: cmpxchg: Update ISA constraints for MIPS R6 support
Nov 20, 2014
0038df2
MIPS: asm: atomic: Update ISA constraints for MIPS R6 support
Jan 6, 2015
87a927e
MIPS: asm: bitops: Update ISA constraints for MIPS R6 support
Nov 20, 2014
1922c35
MIPS: asm: futex: Set the appropriate ISA level for MIPS R6
Nov 19, 2014
5753762
MIPS: asm: spinlock: Replace "sub" instruction with "addiu"
Nov 24, 2014
82e7ce8
MIPS: asm: local: Set the appropriate ISA level for MIPS R6
Jan 15, 2015
180b1e3
MIPS: kernel: cpu-bugs64: Do not check R6 cores for existing 64-bit bugs
Nov 24, 2014
54dac95
MIPS: kernel: cevt-r4k: Add MIPS R6 to the c0_compare_interrupt handler
Nov 13, 2014
8b8aa63
MIPS: kernel: cpu-probe.c: Add support for MIPS R6
Nov 13, 2014
6ebb496
MIPS: kernel: entry.S: Add MIPS R6 related definitions
Nov 14, 2014
515a639
MIPS: kernel: proc: Add MIPS R6 support to /proc/cpuinfo
Nov 14, 2014
9c7d576
MIPS: kernel: traps: Add MIPS R6 related definitions
Nov 14, 2014
207083b
MIPS: kernel: r4k_switch: Add support for MIPS R6
Nov 24, 2014
8d5b9b7
MIPS: kernel: r4k_fpu: Add support for MIPS R6
Nov 25, 2014
938c128
MIPS: kernel: genex: Set correct ISA level
Nov 24, 2014
acac410
MIPS: kernel: cps-vec: Replace "addi" with "addiu"
Nov 24, 2014
0593a44
MIPS: kernel: unaligned: Add support for the MIPS R6
Oct 28, 2014
fee313d
MIPS: kernel: syscall: Set the appropriate ISA level for MIPS R6
Jan 15, 2015
b0ce4bd
MIPS: lib: memcpy: Add MIPS R6 support
Nov 14, 2014
8c56208
MIPS: lib: memset: Add MIPS R6 support
Nov 18, 2014
d2e6d30
MIPS: mm: page: Add MIPS R6 support
Nov 19, 2014
77f3ee5
MIPS: mm: tlbex: Use cpu_has_mips_r2_exec_hazard for the EHB instruction
Nov 24, 2014
4ee4862
MIPS: mm: c-r4k: Set the correct ISA level
Dec 2, 2014
b5ad2c2
MIPS: mm: scache: Add secondary cache support for MIPS R6 cores
Jan 15, 2015
5f9f41c
MIPS: kernel: Prepare the JR instruction for emulation on MIPS R6
Nov 25, 2014
319824e
MIPS: kernel: branch: Do not emulate the branch likelies on MIPS R6
Nov 25, 2014
c8a3458
MIPS: Emulate the BC1{EQ,NE}Z FPU instructions
Nov 26, 2014
a8ff66f
MIPS: Emulate the new MIPS R6 B{L,G}Ε{Z,}{AL,}C instructions
Nov 26, 2014
f1b4406
MIPS: Emulate the new MIPS R6 B{L,G}T{Z,}{AL,}C instructions
Nov 26, 2014
8467ca0
MIPS: Emulate the new MIPS R6 branch compact (BC) instruction
Nov 26, 2014
c893ce3
MIPS: Emulate the new MIPS R6 BOVC, BEQC and BEQZALC instructions
Nov 26, 2014
10d962d
MIPS: Emulate the new MIPS R6 BNVC, BNEC and BNEZLAC instructions
Nov 26, 2014
84fef63
MIPS: Emulate the new MIPS R6 BALC instruction
Nov 26, 2014
69b9a2f
MIPS: Emulate the new MIPS R6 BEQZC and JIC instructions
Nov 27, 2014
28d6f93
MIPS: Emulate the new MIPS R6 BNEZC and JIALC instructions
Jan 8, 2015
5aed9da
MIPS: Add LLB bit and related feature for the Config 5 CP0 register
Dec 2, 2014
b55b9e2
MIPS: asm: mipsregs: Add support for the LLADDR register
Dec 3, 2014
b0a668f
MIPS: kernel: mips-r2-to-r6-emul: Add R2 emulator for MIPS R6
Dec 3, 2014
7c151d3
MIPS: Make use of the ERETNC instruction on MIPS R6
Dec 3, 2014
e0d32f3
MIPS: Handle MIPS IV, V and R2 FPU instructions on MIPS R6 as well
Jan 15, 2015
13e45f0
MIPS: kernel: process: Do not allow FR=0 on MIPS R6
Jan 13, 2015
6134d94
MIPS: asm: fpu: Allow 64-bit FPU on MIPS32 R6
Jan 30, 2015
46490b5
MIPS: kernel: elf: Improve the overall ABI and FPU mode checks
Jan 8, 2015
575509b
MIPS: Malta: Add support for building MIPS R6 kernel
Nov 19, 2014
f296e7c
MIPS: Add Malta QEMU 32R6 defconfig
Nov 24, 2014
dbca51d
switch ll_lookup_finish_locks() and ll_revalidate_it_finish() to inode
Jan 19, 2015
c88b1e7
configfs: configfs_create() init callback is never NULL and it never …
Jan 29, 2015
1cf97d0
configfs: fold create_dir() into its only caller
Jan 29, 2015
28444a2
configfs_add_file: fold into its sole caller
Jan 29, 2015
95fcedb
ARM: vexpress: use ARM_CPU_SUSPEND if needed
arndb Feb 5, 2015
ff34cae
ARM: BCM: put back ARCH_MULTI_V7 dependency for mobile
arndb Jan 23, 2015
31612d6
ARM: davinci: davinci_cfg_reg cannot be init
arndb Jan 23, 2015
99bd667
ARM: davinci: multi-soc kernels require AUTO_ZRELADDR
arndb Jan 27, 2015
a91c582
ARM: at91: fix pm declarations
arndb Jan 25, 2015
d76f733
ARM: prima2: do not select SMP_ON_UP
arndb Jan 25, 2015
1aeb3c5
ARM: ixp4xx: fix {in,out}s{bwl} data types
arndb Jan 26, 2015
c8823e7
ARM: rockchip: make rockchip_suspend_init conditional
arndb Jan 27, 2015
1fd01aa
ARM: sti: always enable RESET_CONTROLLER
arndb Feb 5, 2015
1652351
ARM: mvebu: build armada375-smp code conditionally
arndb Feb 2, 2015
d1bef99
ARM: rockchip: force built-in regulator support for PM
arndb Feb 5, 2015
f495fe8
Merge tag 'arm-soc/for-3.20/dts' of http://github.com/broadcom/stblin…
arndb Feb 18, 2015
d88d6cf
ARM: mm: Remove Kconfig symbol CACHE_PL310
pebolle Feb 10, 2015
338d00c
pnfs: Refactor the *_layout_mark_request_commit to use pnfs_layout_ma…
Feb 17, 2015
65d2918
Merge branch 'cleanups'
trondmypd Feb 18, 2015
79969dd
NFSv4.1: Clean up create_session
trondmypd Feb 18, 2015
b1c0df5
NFSv4.1: Don't set up a backchannel if the server didn't agree to do so
trondmypd Feb 18, 2015
7e9f073
NFSv4.1: Always set up a forward channel when binding the session
trondmypd Feb 18, 2015
71a097c
NFSv4.1: Clean up bind_conn_to_session
trondmypd Feb 18, 2015
543c504
ARM: make arrays containing machine compatible strings const
Feb 18, 2015
444d2d3
ARM: make of_device_ids const
Feb 18, 2015
a8140f3
MIPS: Makefile: Pass -march option on Loongson3A cores
ralfbaechle Feb 19, 2015
32098ec
MIPS: Makefile: Move the ASEs checks after setting the core's CFLAGS
Feb 2, 2015
8cb48fe
MIPS: Provide correct siginfo_t.si_stime
petris Dec 12, 2014
0e16d1e
MIPS: BCM3384: Fix outdated use of mips_cpu_intc_init()
cernekee Dec 25, 2014
3ce465e
MIPS: Export FP functions used by lose_fpu(1) for KVM
Feb 10, 2015
ca5d256
MIPS: Export MSA functions used by lose_fpu(1) for KVM
Feb 10, 2015
661af35
Merge branch 'mipsr6-for-3.20' of git://git.linux-mips.org/pub/scm/mc…
ralfbaechle Feb 19, 2015
05f9883
MIPS: Usage and cosmetic cleanups of page table bits.
Feb 19, 2015
db671a8
don't bother with most of the bad_file_ops methods
Feb 4, 2015
a457ac2
hypfs: switch to read_iter/write_iter
Feb 4, 2015
112fc89
configfs: Fix potential NULL d_inode dereference
dhowells Jan 27, 2015
acd88d4
fs/aio.c: Remove duplicate function name in pr_debug messages
kinglongmee Feb 4, 2015
fcbc32b
coredump: Fix typo in comment
hadess Feb 5, 2015
76bf3f6
autofs4: Wrong format for printing dentry
Villemoes Feb 6, 2015
fed0b58
posix_acl: fix reference leaks in posix_acl_create
osandov Feb 9, 2015
a95104f
Infiniband: Fix potential NULL d_inode dereference
dhowells Jan 27, 2015
ce7b9fa
Merge branch 'overlayfs-next' of git://git.kernel.org/pub/scm/linux/k…
Feb 20, 2015
23be7fd
ARM: 8305/1: DMA: Fix kzalloc flags in __iommu_alloc_buffer()
Gnurou Feb 19, 2015
a5770df
MIPS: Add set/clear CP0 macros for PageGrain register
Feb 19, 2015
51f105d
MIPS: Alchemy: fix Au1000/Au1500 LRCLK calculation
mlauss2 Jan 29, 2015
45a848f
MIPS: Alchemy: preset loops_per_jiffy based on CPU clock
mlauss2 Jan 29, 2015
200276e
MIPS: Alchemy: remove declaration for set_cpuspec
mlauss2 Jan 29, 2015
69e4e63
MIPS: Alchemy: Fix cpu clock calculation
mlauss2 Feb 18, 2015
6fb8a16
mips: pci: Add ifdef around pci_proc_domain
Dec 12, 2014
fa75da8
MIPS: ip22-gio: Remove legacy suspend/resume support
larsclausen Jan 11, 2015
151f914
MIPS: Remove unneeded #ifdef __KERNEL__ from asm/processor.h
daviddaney Dec 18, 2014
9d6b80f
MIPS: boot: Provide more uImage options
Feb 16, 2015
ac655fb
MIPS: OCTEON: Save/Restore wider multiply registers in OCTEON III CPUs
daviddaney Jan 15, 2015
d6e4152
MIPS: OCTEON: Fix FP context save.
daviddaney Jan 15, 2015
6b3a287
MIPS: OCTEON: Save and restore CP2 SHA3 state
daviddaney Jan 15, 2015
2d98cae
MIPS: OCTEON: Use correct instruction to read 64-bit COP0 register
Jan 15, 2015
69f7cd4
MIPS: OCTEON: Delete unused COP2 saving code
Jan 15, 2015
664d699
MIPS: OCTEON: Implement the core-16057 workaround
daviddaney Jan 15, 2015
664f1ae
MIPS: OCTEON: Add little-endian support to asm/octeon/octeon.h
daviddaney Jan 15, 2015
e3d0ead
MIPS: OCTEON: Implement DCache errata workaround for all CN6XXX
daviddaney Jan 15, 2015
debe6a6
MIPS: OCTEON: Update octeon-model.h code for new SoCs.
daviddaney Jan 15, 2015
726da2f
MIPS: OCTEON: Core-15169 Workaround and general CVMSEG cleanup.
daviddaney Jan 15, 2015
920cda3
MIPS: OCTEON: Remove setting of processor specific CVMCTL icache bits.
Jan 15, 2015
ac6d9b3
MIPS: OCTEON: More OCTEONIII support
Jan 15, 2015
2e3ecab
MIPS: OCTEON: Don't do acknowledge operations for level triggered irqs.
daviddaney Jan 15, 2015
64b139f
MIPS: OCTEON: irq: add CIB and other fixes
daviddaney Jan 15, 2015
8fc5ec7
MIPS: mm: Remove dead macro definitions
rupran Feb 12, 2015
44923c9
MIPS: sead3: Corrected get_c0_perfcount_int
Feb 6, 2015
24a52e4
Merge tag 'nfs-for-3.20-2' of git://git.linux-nfs.org/projects/trondm…
torvalds Feb 21, 2015
93aaa83
Merge tag 'xfs-pnfs-for-linus-3.20-rc1' of git://git.kernel.org/pub/s…
torvalds Feb 21, 2015
c8c6c9b
Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/gi…
torvalds Feb 22, 2015
2177033
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ker…
torvalds Feb 22, 2015
a135c71
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upst…
torvalds Feb 22, 2015
155e35d
VFS: Introduce inode-getting helpers for layered/unioned fs environments
dhowells Jan 29, 2015
e7f7d22
VFS: Add a whiteout dentry type
dhowells Jan 29, 2015
df1a085
VFS: Add a fallthrough flag for marking virtual dentries
dhowells Jan 29, 2015
44bdb5e
VFS: Split DCACHE_FILE_TYPE into regular and special types
dhowells Jan 29, 2015
7ac2856
Apparmor: mediated_filesystem() should use dentry->d_sb not inode->i_sb
dhowells Jan 29, 2015
729b8a3
Apparmor: Use d_is_positive/negative() rather than testing dentry->d_…
dhowells Jan 29, 2015
e656a8e
TOMOYO: Use d_is_dir() rather than d_inode and S_ISDIR()
dhowells Jan 29, 2015
8802565
Smack: Use d_is_positive() rather than testing dentry->d_inode
dhowells Jan 29, 2015
2c616d4
SELinux: Use d_is_positive() rather than testing dentry->d_inode
dhowells Jan 29, 2015
e36cb0b
VFS: (Scripted) Convert S_ISLNK/DIR/REG(dentry->d_inode) to d_is_*(de…
dhowells Jan 29, 2015
ce40fa7
Cachefiles: Fix up scripted S_ISDIR/S_ISREG/S_ISLNK conversions
dhowells Jan 29, 2015
54f2a2f
fanotify: Fix up scripted S_ISDIR/S_ISREG/S_ISLNK conversions
dhowells Jan 29, 2015
eb6ef3d
trylock_super(): replacement for grab_super_passive()
koct9i Feb 19, 2015
dca1117
Documentation/filesystems/Locking: ->get_sb() is long gone
Feb 21, 2015
0db59e5
debugfs: leave freeing a symlink body until inode eviction
Feb 22, 2015
7e0e953
procfs: fix race between symlink removals and traversals
Feb 22, 2015
0a28096
autofs4 copy_dev_ioctl(): keep the value of ->size we'd used for allo…
Feb 22, 2015
90c453c
Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
torvalds Feb 22, 2015
be5e661
Merge branch 'for-linus-2' of git://git.kernel.org/pub/scm/linux/kern…
torvalds Feb 23, 2015
feaf222
Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kern…
torvalds Feb 23, 2015
c517d83
Linux 4.0-rc1
torvalds Feb 23, 2015
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Cachefiles: Fix up scripted S_ISDIR/S_ISREG/S_ISLNK conversions
Fix up the following scripted S_ISDIR/S_ISREG/S_ISLNK conversions (or lack
thereof) in cachefiles:

 (1) Cachefiles mostly wants to use d_can_lookup() rather than d_is_dir() as
     it doesn't want to deal with automounts in its cache.

 (2) Coccinelle didn't find S_IS* expressions in ASSERT() statements in
     cachefiles.

Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  • Loading branch information
dhowells authored and Al Viro committed Feb 22, 2015
commit ce40fa78ef8f0e813392903c96de65b947298d16
4 changes: 2 additions & 2 deletions fs/cachefiles/daemon.c
Original file line number Diff line number Diff line change
@@ -574,7 +574,7 @@ static int cachefiles_daemon_cull(struct cachefiles_cache *cache, char *args)
/* extract the directory dentry from the cwd */
get_fs_pwd(current->fs, &path);

if (!d_is_dir(path.dentry))
if (!d_can_lookup(path.dentry))
goto notdir;

cachefiles_begin_secure(cache, &saved_cred);
@@ -646,7 +646,7 @@ static int cachefiles_daemon_inuse(struct cachefiles_cache *cache, char *args)
/* extract the directory dentry from the cwd */
get_fs_pwd(current->fs, &path);

if (!d_is_dir(path.dentry))
if (!d_can_lookup(path.dentry))
goto notdir;

cachefiles_begin_secure(cache, &saved_cred);
4 changes: 2 additions & 2 deletions fs/cachefiles/interface.c
Original file line number Diff line number Diff line change
@@ -437,7 +437,7 @@ static int cachefiles_attr_changed(struct fscache_object *_object)
if (!object->backer)
return -ENOBUFS;

ASSERT(S_ISREG(object->backer->d_inode->i_mode));
ASSERT(d_is_reg(object->backer));

fscache_set_store_limit(&object->fscache, ni_size);

@@ -501,7 +501,7 @@ static void cachefiles_invalidate_object(struct fscache_operation *op)
op->object->debug_id, (unsigned long long)ni_size);

if (object->backer) {
ASSERT(S_ISREG(object->backer->d_inode->i_mode));
ASSERT(d_is_reg(object->backer));

fscache_set_store_limit(&object->fscache, ni_size);

8 changes: 4 additions & 4 deletions fs/cachefiles/namei.c
Original file line number Diff line number Diff line change
@@ -323,7 +323,7 @@ static int cachefiles_bury_object(struct cachefiles_cache *cache,
return 0;
}

if (!d_is_dir(cache->graveyard)) {
if (!d_can_lookup(cache->graveyard)) {
unlock_rename(cache->graveyard, dir);
cachefiles_io_error(cache, "Graveyard no longer a directory");
return -EIO;
@@ -539,7 +539,7 @@ int cachefiles_walk_to_object(struct cachefiles_object *parent,
_debug("mkdir -> %p{%p{ino=%lu}}",
next, next->d_inode, next->d_inode->i_ino);

} else if (!d_is_dir(next)) {
} else if (!d_can_lookup(next)) {
pr_err("inode %lu is not a directory\n",
next->d_inode->i_ino);
ret = -ENOBUFS;
@@ -568,7 +568,7 @@ int cachefiles_walk_to_object(struct cachefiles_object *parent,
_debug("create -> %p{%p{ino=%lu}}",
next, next->d_inode, next->d_inode->i_ino);

} else if (!d_is_dir(next) &&
} else if (!d_can_lookup(next) &&
!d_is_reg(next)
) {
pr_err("inode %lu is not a file or directory\n",
@@ -763,7 +763,7 @@ struct dentry *cachefiles_get_directory(struct cachefiles_cache *cache,
/* we need to make sure the subdir is a directory */
ASSERT(subdir->d_inode);

if (!d_is_dir(subdir)) {
if (!d_can_lookup(subdir)) {
pr_err("%s is not a directory\n", dirname);
ret = -EIO;
goto check_error;
2 changes: 1 addition & 1 deletion fs/cachefiles/rdwr.c
Original file line number Diff line number Diff line change
@@ -900,7 +900,7 @@ int cachefiles_write_page(struct fscache_storage *op, struct page *page)
return -ENOBUFS;
}

ASSERT(S_ISREG(object->backer->d_inode->i_mode));
ASSERT(d_is_reg(object->backer));

cache = container_of(object->fscache.cache,
struct cachefiles_cache, cache);