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

Commit d756d10e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
  ext4: extent macros cleanup
  Fix compilation with EXT_DEBUG, also fix leXX_to_cpu conversions.
  ext4: remove extra IS_RDONLY() check
  ext4: Use is_power_of_2()
  Use zero_user_page() in ext4 where possible
  ext4: Remove 65000 subdirectory limit
  ext4: Expand extra_inodes space per the s_{want,min}_extra_isize fields 
  ext4: Add nanosecond timestamps
  jbd2: Move jbd2-debug file to debugfs
  jbd2: Fix CONFIG_JBD_DEBUG ifdef to be CONFIG_JBD2_DEBUG
  ext4: Set the journal JBD2_FEATURE_INCOMPAT_64BIT on large devices
  ext4: Make extents code sanely handle on-disk corruption
  ext4: copy i_flags to inode flags on write
  ext4: Enable extents by default
  Change on-disk format to support 2^15 uninitialized extents
  write support for preallocated blocks
  fallocate support in ext4
  sys_fallocate() implementation on i386, x86_64 and powerpc
parents cdf4a648 e9f410b1

arch/i386/kernel/syscall_table.S

+1 −0
Original line number Diff line number Diff line
@@ -323,3 +323,4 @@ ENTRY(sys_call_table) 
	.long sys_signalfd

	.long sys_timerfd

	.long sys_eventfd

	.long sys_fallocate

arch/powerpc/kernel/sys_ppc32.c

+7 −0
Original line number Diff line number Diff line
@@ -773,6 +773,13 @@ asmlinkage int compat_sys_truncate64(const char __user * path, u32 reg4, 
	return sys_truncate(path, (high << 32) | low);

}



asmlinkage long compat_sys_fallocate(int fd, int mode, u32 offhi, u32 offlo,

				     u32 lenhi, u32 lenlo)

{

	return sys_fallocate(fd, mode, ((loff_t)offhi << 32) | offlo,

			     ((loff_t)lenhi << 32) | lenlo);

}



asmlinkage int compat_sys_ftruncate64(unsigned int fd, u32 reg4, unsigned long high,

				 unsigned long low)

{

arch/x86_64/ia32/ia32entry.S

+1 −0
Original line number Diff line number Diff line
@@ -719,4 +719,5 @@ ia32_sys_call_table: 
	.quad compat_sys_signalfd

	.quad compat_sys_timerfd

	.quad sys_eventfd

	.quad sys32_fallocate

ia32_syscall_end:

arch/x86_64/ia32/sys_ia32.c

+8 −0
Original line number Diff line number Diff line
@@ -879,3 +879,11 @@ asmlinkage long sys32_fadvise64(int fd, unsigned offset_lo, unsigned offset_hi, 
	return sys_fadvise64_64(fd, ((u64)offset_hi << 32) | offset_lo,

				len, advice);

}



asmlinkage long sys32_fallocate(int fd, int mode, unsigned offset_lo,

				unsigned offset_hi, unsigned len_lo,

				unsigned len_hi)

{

	return sys_fallocate(fd, mode, ((u64)offset_hi << 32) | offset_lo,

			     ((u64)len_hi << 32) | len_lo);

}

fs/Kconfig

+5 −5
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ config JBD2 


config JBD2_DEBUG

	bool "JBD2 (ext4dev/ext4) debugging support"

	depends on JBD2

	depends on JBD2 && DEBUG_FS

	help

	  If you are using the ext4dev/ext4 journaled file system (or

	  potentially any other filesystem/device using JBD2), this option
@@ -260,10 +260,10 @@ config JBD2_DEBUG 
	  By default, the debugging output will be turned off.



	  If you select Y here, then you will be able to turn on debugging

	  with "echo N > /proc/sys/fs/jbd2-debug", where N is a number between

	  1 and 5. The higher the number, the more debugging output is

	  generated.  To turn debugging off again, do

	  "echo 0 > /proc/sys/fs/jbd2-debug".

	  with "echo N > /sys/kernel/debug/jbd2/jbd2-debug", where N is a

	  number between 1 and 5. The higher the number, the more debugging

	  output is generated.  To turn debugging off again, do

	  "echo 0 > /sys/kernel/debug/jbd2/jbd2-debug".



config FS_MBCACHE

# Meta block cache for Extended Attributes (ext2/ext3/ext4)