Merge branch 'master' into for-2.6.35
Jens Axboe [Fri, 21 May 2010 19:27:26 +0000 (21:27 +0200)]
Conflicts:
fs/ext3/fsync.c

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

13 files changed:
1  2 
block/blk-cgroup.c
block/cfq-iosched.c
drivers/block/drbd/drbd_worker.c
fs/ext3/fsync.c
fs/fcntl.c
fs/gfs2/rgrp.c
fs/nilfs2/the_nilfs.c
fs/xfs/linux-2.6/xfs_super.c
include/linux/fs.h
init/Kconfig
kernel/sysctl.c
kernel/trace/trace.c
net/core/skbuff.c

Simple merge
Simple merge
Simple merge
diff --cc 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
Simple merge
Simple merge
Simple merge
diff --cc init/Kconfig
Simple merge
diff --cc kernel/sysctl.c
Simple merge
Simple merge
Simple merge