From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 2 Apr 2022 02:57:03 +0000 (-0700)
Subject: Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=88e6c0207623874922712e162e25d9dafd39661e;p=linux.git

Merge branch 'work.misc' of git://git./linux/kernel/git/viro/vfs

Pull vfs updates from Al Viro:
 "Assorted bits and pieces"

* 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  aio: drop needless assignment in aio_read()
  clean overflow checks in count_mounts() a bit
  seq_file: fix NULL pointer arithmetic warning
  uml/x86: use x86 load_unaligned_zeropad()
  asm/user.h: killed unused macros
  constify struct path argument of finish_automount()/do_add_mount()
  fs: Remove FIXME comment in generic_write_checks()
---

88e6c0207623874922712e162e25d9dafd39661e
diff --cc arch/x86/um/Kconfig
index ead7e5b3a9757,4eb47d3ba6250..1bcd42c530394
--- a/arch/x86/um/Kconfig
+++ b/arch/x86/um/Kconfig
@@@ -8,7 -8,7 +8,8 @@@ endmen
  
  config UML_X86
  	def_bool y
 +	select ARCH_BINFMT_ELF_EXTRA_PHDRS if X86_32
+ 	select DCACHE_WORD_ACCESS
  
  config 64BIT
  	bool "64-bit kernel" if "$(SUBARCH)" = "x86"
diff --cc fs/read_write.c
index dc5000173b80a,0173dc7183c9d..e643aec2b0efe
--- a/fs/read_write.c
+++ b/fs/read_write.c
@@@ -1627,10 -1634,9 +1627,9 @@@ int generic_write_checks_count(struct k
  	if (IS_SWAPFILE(inode))
  		return -ETXTBSY;
  
 -	if (!iov_iter_count(from))
 +	if (!*count)
  		return 0;
  
- 	/* FIXME: this is for backwards compatibility with 2.4 */
  	if (iocb->ki_flags & IOCB_APPEND)
  		iocb->ki_pos = i_size_read(inode);