kernel.git/fs/jbd2/checkpoint.c, branch linux-2.6.37.y

Merge branch 'next' into upstream-merge

2010-10-28T03:44:47Z

Conflicts: fs/ext4/inode.c fs/ext4/mballoc.c include/trace/events/ext4.h

jbd2: Add sanity check for attempts to start handle during umount

2010-10-28T01:30:04Z

An attempt to modify the file system during the call to jbd2_destroy_journal() can lead to a system lockup. So add some checking to make it much more obvious when this happens to and to determine where the offending code is located. Signed-off-by: "Theodore Ts'o"

block: remove BLKDEV_IFL_WAIT

2010-09-16T18:52:58Z

All the blkdev_issue_* helpers can only sanely be used for synchronous caller. To issue cache flushes or barriers asynchronously the caller needs to set up a bio by itself with a completion callback to move the asynchronous state machine ahead. So drop the BLKDEV_IFL_WAIT flag that is always specified when calling blkdev_issue_* and also remove the now unused flags argument to blkdev_issue_flush and blkdev_issue_zeroout. For blkdev_issue_discard we need to keep it for the secure discard flag, which gains a more descriptive name and loses the bitops vs flag confusion. Signed-off-by: Christoph Hellwig Signed-off-by: Jens Axboe

remove SWRITE* I/O types

2010-08-18T05:09:01Z

These flags aren't real I/O types, but tell ll_rw_block to always lock the buffer instead of giving up on a failed trylock. Instead add a new write_dirty_buffer helper that implements this semantic and use it from the existing SWRITE* callers. Note that the ll_rw_block code had a bug where it didn't promote WRITE_SYNC_PLUG properly, which this patch fixes. In the ufs code clean up the helper that used to call ll_rw_block to mirror sync_dirty_buffer, which is the function it implements for compound buffers. Signed-off-by: Christoph Hellwig Signed-off-by: Al Viro

jbd2: Change j_state_lock to be a rwlock_t

2010-08-04T01:35:12Z

Lockstat reports have shown that j_state_lock is a major source of lock contention, especially on systems with more than 4 CPU cores. So change it to be a read/write spinlock. Signed-off-by: "Theodore Ts'o"

jbd2: Use atomic variables to avoid taking t_handle_lock in jbd2_journal_stop

2010-08-02T12:43:25Z

By using an atomic_t for t_updates and t_outstanding credits, this should allow us to not need to take transaction t_handle_lock in jbd2_journal_stop(). Signed-off-by: "Theodore Ts'o"

blkdev: generalize flags for blkdev_issue_fn functions

2010-04-28T17:47:36Z

The patch just convert all blkdev_issue_xxx function to common set of flags. Wait/allocation semantics preserved. Signed-off-by: Dmitry Monakhov Signed-off-by: Jens Axboe

ext4: Add new tracepoint for jbd2_cleanup_journal_tail

2009-12-23T12:45:44Z

Signed-off-by: "Theodore Ts'o"

ext4, jbd2: Add barriers for file systems with exernal journals

2009-12-23T11:52:08Z

This is a bit complicated because we are trying to optimize when we send barriers to the fs data disk. We could just throw in an extra barrier to the data disk whenever we send a barrier to the journal disk, but that's not always strictly necessary. We only need to send a barrier during a commit when there are data blocks which are must be written out due to an inode written in ordered mode, or if fsync() depends on the commit to force data blocks to disk. Finally, before we drop transactions from the beginning of the journal during a checkpoint operation, we need to guarantee that any blocks that were flushed out to the data disk are firmly on the rust platter before we drop the transaction from the journal. Thanks to Oleg Drokin for pointing out this flaw in ext3/ext4. Signed-off-by: "Theodore Ts'o"

jbd2: Use tracepoints for history file

2009-09-30T04:32:06Z

The /proc/fs/jbd2//history was maintained manually; by using tracepoints, we can get all of the existing functionality of the /proc file plus extra capabilities thanks to the ftrace infrastructure. We save memory as a bonus. Signed-off-by: "Theodore Ts'o"