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

Commit c4755d16 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: (48 commits)
  ext4: fix hot spins in mballoc after err_freebuddy and err_freemeta
  ext4: fix test ext_generic_write_end() copied return value
  ext3: fix test ext_generic_write_end() copied return value
  ext4: Move mballoc headers/structures to a seperate header file mballoc.h
  ext4: cleanup for compiling mballoc with verification and debugging #defines
  ext4: don't use ext4_error in ext4_check_descriptors
  ext4: mark inode dirty after initializing the extent tree
  ext4: update ctime and mtime for truncate with extents.
  ext4: Don't do GFP_NOFS allocations after taking ext4_lock_group
  ext4: move headers out of include/linux
  ext4: fix wrong gfp type under transaction
  ext4: Fix hang on umount with quotas when journal is aborted
  ext4: Fix update of mtime and ctime on rename
  jdb2: replace remaining __FUNCTION__ occurrences
  ext4: replace remaining __FUNCTION__ occurrences
  jbd2: only create debugfs and stats entries if init is successful
  jbd2: fix kernel-doc notation
  jbd2: replace potentially false assertion with if block
  jbd2: eliminate duplicated code in revocation table init/destroy functions
  jbd2: tidy up revoke cache initialisation and destruction
  ...
parents c15a2434 f1fa3342

arch/arm/mm/mmu.c

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ extern pgd_t swapper_pg_dir[PTRS_PER_PGD]; 
 * zero-initialized data and COW.

 */

struct page *empty_zero_page;

EXPORT_SYMBOL(empty_zero_page);



/*

 * The pmd table for the upper-most set of pages.

arch/m68k/mm/init.c

+1 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ void __init m68k_setup_node(int node) 
 */



void *empty_zero_page;

EXPORT_SYMBOL(empty_zero_page);



void show_mem(void)

{

arch/sparc/kernel/sparc_ksyms.c

+2 −0
Original line number Diff line number Diff line
@@ -282,3 +282,5 @@ EXPORT_SYMBOL(do_BUG); 


/* Sun Power Management Idle Handler */

EXPORT_SYMBOL(pm_idle);



EXPORT_SYMBOL(empty_zero_page);

arch/sparc64/mm/init.c

+1 −0
Original line number Diff line number Diff line
@@ -160,6 +160,7 @@ extern unsigned int sparc_ramdisk_image; 
extern unsigned int sparc_ramdisk_size;



struct page *mem_map_zero __read_mostly;

EXPORT_SYMBOL(mem_map_zero);



unsigned int sparc64_highest_unlocked_tlb_ent __read_mostly;

fs/ext3/inode.c

+8 −6
Original line number Diff line number Diff line
@@ -1261,10 +1261,11 @@ static int ext3_ordered_write_end(struct file *file, 
		new_i_size = pos + copied;

		if (new_i_size > EXT3_I(inode)->i_disksize)

			EXT3_I(inode)->i_disksize = new_i_size;

		copied = ext3_generic_write_end(file, mapping, pos, len, copied,

		ret2 = ext3_generic_write_end(file, mapping, pos, len, copied,

							page, fsdata);

		if (copied < 0)

			ret = copied;

		copied = ret2;

		if (ret2 < 0)

			ret = ret2;

	}

	ret2 = ext3_journal_stop(handle);

	if (!ret)
@@ -1289,10 +1290,11 @@ static int ext3_writeback_write_end(struct file *file, 
	if (new_i_size > EXT3_I(inode)->i_disksize)

		EXT3_I(inode)->i_disksize = new_i_size;



	copied = ext3_generic_write_end(file, mapping, pos, len, copied,

	ret2 = ext3_generic_write_end(file, mapping, pos, len, copied,

							page, fsdata);

	if (copied < 0)

		ret = copied;

	copied = ret2;

	if (ret2 < 0)

		ret = ret2;



	ret2 = ext3_journal_stop(handle);

	if (!ret)