Merge branch 'master' into for-2.6.35

Conflicts:
	fs/ext3/fsync.c

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

diff --cc block/blk-cgroup.c
Simple merge

diff --cc block/cfq-iosched.c
Simple merge

diff --cc drivers/block/drbd/drbd_worker.c
Simple merge

diff --cc fs/ext3/fsync.c
index 9492f6003ef99afbd7498ebd55224c1900be2361,26289e8f4163c22b16dbb3cdd6c9293e814e354b..fcf7487734b68d24d851014f3556aa4f199fe7a3
--- 1/fs/ext3/fsync.c
--- 2/fs/ext3/fsync.c
+++ b/fs/ext3/fsync.c
@@@ -90,9 -89,7 +89,8 @@@ int ext3_sync_file(struct file * file, 
         * disk caches manually so that data really is on persistent
         * storage
         */
-       if (test_opt(inode->i_sb, BARRIER))
+       if (needs_barrier)
 -              blkdev_issue_flush(inode->i_sb->s_bdev, NULL);
 +              blkdev_issue_flush(inode->i_sb->s_bdev, GFP_KERNEL, NULL,
 +                              BLKDEV_IFL_WAIT);
- out:
        return ret;
  }

diff --cc fs/fcntl.c
Simple merge

diff --cc fs/gfs2/rgrp.c
Simple merge

diff --cc fs/nilfs2/the_nilfs.c
Simple merge

diff --cc fs/xfs/linux-2.6/xfs_super.c
Simple merge

diff --cc include/linux/fs.h
Simple merge

diff --cc init/Kconfig
Simple merge

diff --cc kernel/sysctl.c
Simple merge

diff --cc kernel/trace/trace.c
Simple merge

diff --cc net/core/skbuff.c
Simple merge