From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 27 May 2010 17:26:37 +0000 (-0700)
Subject: Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e4ce30f3779c2ddaa7dfaa4042209e5dbacbada5;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

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

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (40 commits)
  ext4: Make fsync sync new parent directories in no-journal mode
  ext4: Drop whitespace at end of lines
  ext4: Fix compat EXT4_IOC_ADD_GROUP
  ext4: Conditionally define compat ioctl numbers
  tracing: Convert more ext4 events to DEFINE_EVENT
  ext4: Add new tracepoints to track mballoc's buddy bitmap loads
  ext4: Add a missing trace hook
  ext4: restart ext4_ext_remove_space() after transaction restart
  ext4: Clear the EXT4_EOFBLOCKS_FL flag only when warranted
  ext4: Avoid crashing on NULL ptr dereference on a filesystem error
  ext4: Use bitops to read/modify i_flags in struct ext4_inode_info
  ext4: Convert calls of ext4_error() to EXT4_ERROR_INODE()
  ext4: Convert callers of ext4_get_blocks() to use ext4_map_blocks()
  ext4: Add new abstraction ext4_map_blocks() underneath ext4_get_blocks()
  ext4: Use our own write_cache_pages()
  ext4: Show journal_checksum option
  ext4: Fix for ext4_mb_collect_stats()
  ext4: check for a good block group before loading buddy pages
  ext4: Prevent creation of files larger than RLIMIT_FSIZE using fallocate
  ext4: Remove extraneous newlines in ext4_msg() calls
  ...

Fixed up trivial conflict in fs/ext4/fsync.c
---

e4ce30f3779c2ddaa7dfaa4042209e5dbacbada5
diff --cc fs/ext4/fsync.c
index ef3d980e67cb,e187f87acec0..b6a74f991bf4
--- a/fs/ext4/fsync.c
+++ b/fs/ext4/fsync.c
@@@ -100,11 -127,9 +127,11 @@@ int ext4_sync_file(struct file *file, s
  		if (ext4_should_writeback_data(inode) &&
  		    (journal->j_fs_dev != journal->j_dev) &&
  		    (journal->j_flags & JBD2_BARRIER))
 -			blkdev_issue_flush(inode->i_sb->s_bdev, NULL);
 +			blkdev_issue_flush(inode->i_sb->s_bdev, GFP_KERNEL,
 +					NULL, BLKDEV_IFL_WAIT);
- 		jbd2_log_wait_commit(journal, commit_tid);
+ 		ret = jbd2_log_wait_commit(journal, commit_tid);
  	} else if (journal->j_flags & JBD2_BARRIER)
 -		blkdev_issue_flush(inode->i_sb->s_bdev, NULL);
 +		blkdev_issue_flush(inode->i_sb->s_bdev, GFP_KERNEL, NULL,
 +			BLKDEV_IFL_WAIT);
  	return ret;
  }