Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e4d26920 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge android-4.14.35 (07e13892) into msm-4.14"

parents ef2c2342 bce6a977

Documentation/ABI/testing/sysfs-fs-f2fs

+11 −0
Original line number Diff line number Diff line
@@ -192,3 +192,14 @@ Date: November 2017 
Contact:	"Sheng Yong" <shengyong1@huawei.com>

Description:

		 Controls readahead inode block in readdir.



What:		/sys/fs/f2fs/<disk>/extension_list

Date:		Feburary 2018

Contact:	"Chao Yu" <yuchao0@huawei.com>

Description:

		 Used to control configure extension list:

		 - Query: cat /sys/fs/f2fs/<disk>/extension_list

		 - Add: echo '[h/c]extension' > /sys/fs/f2fs/<disk>/extension_list

		 - Del: echo '[h/c]!extension' > /sys/fs/f2fs/<disk>/extension_list

		 - [h] means add/del hot file extension

		 - [c] means add/del cold file extension

Documentation/filesystems/f2fs.txt

+17 −0
Original line number Diff line number Diff line
@@ -174,6 +174,23 @@ offgrpjquota Turn off group journelled quota. 
offprjjquota           Turn off project journelled quota.

quota                  Enable plain user disk quota accounting.

noquota                Disable all plain disk quota option.

whint_mode=%s          Control which write hints are passed down to block

                       layer. This supports "off", "user-based", and

                       "fs-based".  In "off" mode (default), f2fs does not pass

                       down hints. In "user-based" mode, f2fs tries to pass

                       down hints given by users. And in "fs-based" mode, f2fs

                       passes down hints with its policy.

alloc_mode=%s          Adjust block allocation policy, which supports "reuse"

                       and "default".

fsync_mode=%s          Control the policy of fsync. Currently supports "posix"

                       and "strict". In "posix" mode, which is default, fsync

                       will follow POSIX semantics and does a light operation

                       to improve the filesystem performance. In "strict" mode,

                       fsync will be heavy and behaves in line with xfs, ext4

                       and btrfs, where xfstest generic/342 will pass, but the

                       performance will regress.

test_dummy_encryption  Enable dummy encryption, which provides a fake fscrypt

                       context. The fake fscrypt context is used by xfstests.



================================================================================

DEBUGFS ENTRIES

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 34

SUBLEVEL = 35

EXTRAVERSION =

NAME = Petit Gorille

arch/parisc/kernel/drivers.c

+4 −0
Original line number Diff line number Diff line
@@ -651,6 +651,10 @@ static int match_pci_device(struct device *dev, int index, 
					(modpath->mod == PCI_FUNC(devfn)));

	}



	/* index might be out of bounds for bc[] */

	if (index >= 6)

		return 0;



	id = PCI_SLOT(pdev->devfn) | (PCI_FUNC(pdev->devfn) << 5);

	return (modpath->bc[index] == id);

}

arch/parisc/kernel/hpmc.S

+5 −1
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ END(hpmc_pim_data) 
	.text



	.import intr_save, code

	.align 16

ENTRY_CFI(os_hpmc)

.os_hpmc:
@@ -300,12 +301,15 @@ os_hpmc_6: 


	b .

	nop

	.align 16	/* make function length multiple of 16 bytes */

ENDPROC_CFI(os_hpmc)

.os_hpmc_end:





	__INITRODATA

.globl os_hpmc_size

	.align 4

	.export os_hpmc_size

	.type   os_hpmc_size, @object

	.size   os_hpmc_size, 4

os_hpmc_size:

	.word .os_hpmc_end-.os_hpmc