linux-toradex.git/fs/ext4, branch v4.13-rc5

ext4: fix copy paste error in ext4_swap_extents()

2017-08-06T05:33:07+00:00

This bug was found by a static code checker tool for copy paste
problems.

Signed-off-by: Maninder Singh 
Signed-off-by: Vaneet Narang 
Signed-off-by: Theodore Ts'o

ext4: fix overflow caused by missing cast in ext4_resize_fs()

2017-08-06T05:18:31+00:00

On a 32-bit platform, the value of n_blcoks_count may be wrong during
the file system is resized to size larger than 2^32 blocks.  This may
caused the superblock being corrupted with zero blocks count.

Fixes: 1c6bd7173d66
Signed-off-by: Jerry Lee 
Signed-off-by: Theodore Ts'o 
Cc: stable@vger.kernel.org # 3.7+

ext4, project: expand inode extra size if possible

2017-08-06T05:00:49+00:00

When upgrading from old format, try to set project id
to old file first time, it will return EOVERFLOW, but if
that file is dirtied(touch etc), changing project id will
be allowed, this might be confusing for users, we could
try to expand @i_extra_isize here too.

Reported-by: Zhang Yi 
Signed-off-by: Miao Xie 
Signed-off-by: Wang Shilong 
Signed-off-by: Theodore Ts'o

ext4: cleanup ext4_expand_extra_isize_ea()

2017-08-06T04:55:48+00:00

Clean up some goto statement, make ext4_expand_extra_isize_ea() clearer.

Signed-off-by: Miao Xie 
Signed-off-by: Theodore Ts'o 
Reviewed-by: Wang Shilong

ext4: restructure ext4_expand_extra_isize

2017-08-06T04:40:01+00:00

Current ext4_expand_extra_isize just tries to expand extra isize, if
someone is holding xattr lock or some check fails, it will give up.
So rename its name to ext4_try_to_expand_extra_isize.

Besides that, we clean up unnecessary check and move some relative checks
into it.

Signed-off-by: Miao Xie 
Signed-off-by: Theodore Ts'o 
Reviewed-by: Wang Shilong

ext4: fix forgetten xattr lock protection in ext4_expand_extra_isize

2017-08-06T04:27:38+00:00

We should avoid the contention between the i_extra_isize update and
the inline data insertion, so move the xattr trylock in front of
i_extra_isize update.

Signed-off-by: Miao Xie 
Reviewed-by: Wang Shilong

ext4: make xattr inode reads faster

2017-08-06T04:07:01+00:00

ext4_xattr_inode_read() currently reads each block sequentially while
waiting for io operation to complete before moving on to the next
block. This prevents request merging in block layer.

Add a ext4_bread_batch() function that starts reads for all blocks
then optionally waits for them to complete. A similar logic is used
in ext4_find_entry(), so update that code to use the new function.

Signed-off-by: Tahsin Erdogan 
Signed-off-by: Theodore Ts'o

ext4: inplace xattr block update fails to deduplicate blocks

2017-08-06T02:41:42+00:00

When an xattr block has a single reference, block is updated inplace
and it is reinserted to the cache. Later, a cache lookup is performed
to see whether an existing block has the same contents. This cache
lookup will most of the time return the just inserted entry so
deduplication is not achieved.

Running the following test script will produce two xattr blocks which
can be observed in "File ACL: " line of debugfs output:

  mke2fs -b 1024 -I 128 -F -O extent /dev/sdb 1G
  mount /dev/sdb /mnt/sdb

  touch /mnt/sdb/{x,y}

  setfattr -n user.1 -v aaa /mnt/sdb/x
  setfattr -n user.2 -v bbb /mnt/sdb/x

  setfattr -n user.1 -v aaa /mnt/sdb/y
  setfattr -n user.2 -v bbb /mnt/sdb/y

  debugfs -R 'stat x' /dev/sdb | cat
  debugfs -R 'stat y' /dev/sdb | cat

This patch defers the reinsertion to the cache so that we can locate
other blocks with the same contents.

Signed-off-by: Tahsin Erdogan 
Signed-off-by: Theodore Ts'o 
Reviewed-by: Andreas Dilger

ext4: remove unused mode parameter

2017-08-06T02:15:45+00:00

ext4_alloc_file_blocks() does not use its mode parameter. Remove it.

Signed-off-by: Tahsin Erdogan 
Signed-off-by: Theodore Ts'o

ext4: fix warning about stack corruption

2017-08-06T01:57:46+00:00

After commit 62d1034f53e3 ("fortify: use WARN instead of BUG for now"),
we get a warning about possible stack overflow from a memcpy that
was not strictly bounded to the size of the local variable:

    inlined from 'ext4_mb_seq_groups_show' at fs/ext4/mballoc.c:2322:2:
include/linux/string.h:309:9: error: '__builtin_memcpy': writing between 161 and 1116 bytes into a region of size 160 overflows the destination [-Werror=stringop-overflow=]

We actually had a bug here that would have been found by the warning,
but it was already fixed last year in commit 30a9d7afe70e ("ext4: fix
stack memory corruption with 64k block size").

This replaces the fixed-length structure on the stack with a variable-length
structure, using the correct upper bound that tells the compiler that
everything is really fine here. I also change the loop count to check
for the same upper bound for consistency, but the existing code is
already correct here.

Note that while clang won't allow certain kinds of variable-length arrays
in structures, this particular instance is fine, as the array is at the
end of the structure, and the size is strictly bounded.

Signed-off-by: Arnd Bergmann 
Signed-off-by: Theodore Ts'o