Merge remote-tracking branch 'origin/upstream-f2fs-stable-linux-4.9.y' into android-4.9 (90e7a900) · Commits · e / devices / android_kernel_fairphone_FP3

Documentation/filesystems/fscrypt.rst

0 → 100644

+626 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/md/dm-table.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -511,14 +511,14 @@ static int adjoin(struct dm_table table, struct dm_target ti)
		* On the other hand, dm-switch needs to process bulk data using messages and
		* excessive use of GFP_NOIO could cause trouble.
		*/
		static char *realloc_argv(unsigned array_size, char **old_argv)
		static char *realloc_argv(unsigned size, char **old_argv)
		{
		char **argv;
		unsigned new_size;
		gfp_t gfp;

		if (*array_size) {
		new_size = array_size 2;
		if (*size) {
		new_size = size 2;
		gfp = GFP_KERNEL;
		} else {
		new_size = 8;
		@@ -526,8 +526,8 @@ static char *realloc_argv(unsigned array_size, char **old_argv)
		}
		argv = kmalloc(new_size * sizeof(*argv), gfp);
		if (argv) {
		memcpy(argv, old_argv, array_size sizeof(*argv));
		*array_size = new_size;
		memcpy(argv, old_argv, size sizeof(*argv));
		*size = new_size;
		}

		kfree(old_argv);

fs/btrfs/extent_io.c

+4 −15

Original line number	Diff line number	Diff line
		@@ -3830,8 +3830,8 @@ int btree_write_cache_pages(struct address_space *mapping,
		if (wbc->sync_mode == WB_SYNC_ALL)
		tag_pages_for_writeback(mapping, index, end);
		while (!done && !nr_to_write_done && (index <= end) &&
		(nr_pages = pagevec_lookup_tag(&pvec, mapping, &index, tag,
		min(end - index, (pgoff_t)PAGEVEC_SIZE-1) + 1))) {
		(nr_pages = pagevec_lookup_range_tag(&pvec, mapping, &index, end,
		tag))) {
		unsigned i;

		scanned = 1;
		@@ -3841,11 +3841,6 @@ int btree_write_cache_pages(struct address_space *mapping,
		if (!PagePrivate(page))
		continue;

		if (!wbc->range_cyclic && page->index > end) {
		done = 1;
		break;
		}

		spin_lock(&mapping->private_lock);
		if (!PagePrivate(page)) {
		spin_unlock(&mapping->private_lock);
		@@ -3978,8 +3973,8 @@ static int extent_write_cache_pages(struct extent_io_tree *tree,
		tag_pages_for_writeback(mapping, index, end);
		done_index = index;
		while (!done && !nr_to_write_done && (index <= end) &&
		(nr_pages = pagevec_lookup_tag(&pvec, mapping, &index, tag,
		min(end - index, (pgoff_t)PAGEVEC_SIZE-1) + 1))) {
		(nr_pages = pagevec_lookup_range_tag(&pvec, mapping,
		&index, end, tag))) {
		unsigned i;

		scanned = 1;
		@@ -4004,12 +3999,6 @@ static int extent_write_cache_pages(struct extent_io_tree *tree,
		continue;
		}

		if (!wbc->range_cyclic && page->index > end) {
		done = 1;
		unlock_page(page);
		continue;
		}

		if (wbc->sync_mode != WB_SYNC_NONE) {
		if (PageWriteback(page))
		flush_fn(data);

fs/ceph/addr.c

+3 −15

Original line number	Diff line number	Diff line
		@@ -838,21 +838,15 @@ static int ceph_writepages_start(struct address_space *mapping,
		struct page pages = NULL, data_pages;
		mempool_t pool = NULL; / Becomes non-null if mempool used */
		struct page *page;
		int want;
		u64 offset = 0, len = 0;

		max_pages = max_pages_ever;

		get_more_pages:
		first = -1;
		want = min(end - index,
		min((pgoff_t)PAGEVEC_SIZE,
		max_pages - (pgoff_t)locked_pages) - 1)
		+ 1;
		pvec_pages = pagevec_lookup_tag(&pvec, mapping, &index,
		PAGECACHE_TAG_DIRTY,
		want);
		dout("pagevec_lookup_tag got %d\n", pvec_pages);
		pvec_pages = pagevec_lookup_range_tag(&pvec, mapping, &index,
		end, PAGECACHE_TAG_DIRTY);
		dout("pagevec_lookup_range_tag got %d\n", pvec_pages);
		if (!pvec_pages && !locked_pages)
		break;
		for (i = 0; i < pvec_pages && locked_pages < max_pages; i++) {
		@@ -870,12 +864,6 @@ static int ceph_writepages_start(struct address_space *mapping,
		unlock_page(page);
		break;
		}
		if (!wbc->range_cyclic && page->index > end) {
		dout("end of range %p\n", page);
		done = 1;
		unlock_page(page);
		break;
		}
		if (strip_unit_end && (page->index > strip_unit_end)) {
		dout("end of strip unit %p\n", page);
		unlock_page(page);

fs/crypto/crypto.c

+36 −11

Original line number	Diff line number	Diff line
		@@ -162,12 +162,8 @@ int fscrypt_do_page_crypto(const struct inode *inode, fscrypt_direction_t rw,
		}

		req = skcipher_request_alloc(tfm, gfp_flags);
		if (!req) {
		printk_ratelimited(KERN_ERR
		"%s: crypto_request_alloc() failed\n",
		__func__);
		if (!req)
		return -ENOMEM;
		}

		skcipher_request_set_callback(
		req, CRYPTO_TFM_REQ_MAY_BACKLOG \| CRYPTO_TFM_REQ_MAY_SLEEP,
		@@ -184,9 +180,10 @@ int fscrypt_do_page_crypto(const struct inode *inode, fscrypt_direction_t rw,
		res = crypto_wait_req(crypto_skcipher_encrypt(req), &wait);
		skcipher_request_free(req);
		if (res) {
		printk_ratelimited(KERN_ERR
		"%s: crypto_skcipher_encrypt() returned %d\n",
		__func__, res);
		fscrypt_err(inode->i_sb,
		"%scryption failed for inode %lu, block %llu: %d",
		(rw == FS_DECRYPT ? "de" : "en"),
		inode->i_ino, lblk_num, res);
		return res;
		}
		return 0;
		@@ -332,7 +329,6 @@ static int fscrypt_d_revalidate(struct dentry *dentry, unsigned int flags)
		return 0;
		}

		/* this should eventually be an flag in d_flags */
		spin_lock(&dentry->d_lock);
		cached_with_key = dentry->d_flags & DCACHE_ENCRYPTED_WITH_KEY;
		spin_unlock(&dentry->d_lock);
		@@ -359,7 +355,6 @@ static int fscrypt_d_revalidate(struct dentry *dentry, unsigned int flags)
		const struct dentry_operations fscrypt_d_ops = {
		.d_revalidate = fscrypt_d_revalidate,
		};
		EXPORT_SYMBOL(fscrypt_d_ops);

		void fscrypt_restore_control_page(struct page *page)
		{
		@@ -428,13 +423,43 @@ int fscrypt_initialize(unsigned int cop_flags)
		return res;
		}

		void fscrypt_msg(struct super_block sb, const char level,
		const char *fmt, ...)
		{
		static DEFINE_RATELIMIT_STATE(rs, DEFAULT_RATELIMIT_INTERVAL,
		DEFAULT_RATELIMIT_BURST);
		struct va_format vaf;
		va_list args;

		if (!__ratelimit(&rs))
		return;

		va_start(args, fmt);
		vaf.fmt = fmt;
		vaf.va = &args;
		if (sb)
		printk("%sfscrypt (%s): %pV\n", level, sb->s_id, &vaf);
		else
		printk("%sfscrypt: %pV\n", level, &vaf);
		va_end(args);
		}

		/**
		* fscrypt_init() - Set up for fs encryption.
		*/
		static int __init fscrypt_init(void)
		{
		/*
		* Use an unbound workqueue to allow bios to be decrypted in parallel
		* even when they happen to complete on the same CPU. This sacrifices
		* locality, but it's worthwhile since decryption is CPU-intensive.
		*
		* Also use a high-priority workqueue to prioritize decryption work,
		* which blocks reads from completing, over regular application tasks.
		*/
		fscrypt_read_workqueue = alloc_workqueue("fscrypt_read_queue",
		WQ_HIGHPRI, 0);
		WQ_UNBOUND \| WQ_HIGHPRI,
		num_online_cpus());
		if (!fscrypt_read_workqueue)
		goto fail;