Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6 (2511817c) · Commits · 戴 / test

MAINTAINERS

+1 −2

Original line number	Diff line number	Diff line
		@@ -1973,7 +1973,6 @@ F: fs/ext2/
		F: include/linux/ext2*

		EXT3 FILE SYSTEM
		M: Stephen Tweedie <sct@redhat.com>
		M: Andrew Morton <akpm@linux-foundation.org>
		M: Andreas Dilger <adilger@sun.com>
		L: linux-ext4@vger.kernel.org
		@@ -2901,8 +2900,8 @@ F: fs/jffs2/
		F: include/linux/jffs2.h

		JOURNALLING LAYER FOR BLOCK DEVICES (JBD)
		M: Stephen Tweedie <sct@redhat.com>
		M: Andrew Morton <akpm@linux-foundation.org>
		M: Jan Kara <jack@suse.cz>
		L: linux-ext4@vger.kernel.org
		S: Maintained
		F: fs/jbd*/

fs/ext3/fsync.c

+11 −1

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@
		*/

		#include <linux/time.h>
		#include <linux/blkdev.h>
		#include <linux/fs.h>
		#include <linux/sched.h>
		#include <linux/writeback.h>
		@@ -73,7 +74,7 @@ int ext3_sync_file(struct file * file, struct dentry *dentry, int datasync)
		}

		if (datasync && !(inode->i_state & I_DIRTY_DATASYNC))
		goto out;
		goto flush;

		/*
		* The VFS has written the file data. If the inode is unaltered
		@@ -85,7 +86,16 @@ int ext3_sync_file(struct file * file, struct dentry *dentry, int datasync)
		.nr_to_write = 0, /* sys_fsync did this */
		};
		ret = sync_inode(inode, &wbc);
		goto out;
		}
		flush:
		/*
		* In case we didn't commit a transaction, we have to flush
		* disk caches manually so that data really is on persistent
		* storage
		*/
		if (test_opt(inode->i_sb, BARRIER))
		blkdev_issue_flush(inode->i_sb->s_bdev, NULL);
		out:
		return ret;
		}

fs/ext3/inode.c

+24 −4

Original line number	Diff line number	Diff line
		@@ -172,10 +172,21 @@ static int try_to_extend_transaction(handle_t handle, struct inode inode)
		* so before we call here everything must be consistently dirtied against
		* this transaction.
		*/
		static int ext3_journal_test_restart(handle_t handle, struct inode inode)
		static int truncate_restart_transaction(handle_t handle, struct inode inode)
		{
		int ret;

		jbd_debug(2, "restarting handle %p\n", handle);
		return ext3_journal_restart(handle, blocks_for_truncate(inode));
		/*
		* Drop truncate_mutex to avoid deadlock with ext3_get_blocks_handle
		* At this moment, get_block can be called only for blocks inside
		* i_size since page cache has been already dropped and writes are
		* blocked by i_mutex. So we can safely drop the truncate_mutex.
		*/
		mutex_unlock(&EXT3_I(inode)->truncate_mutex);
		ret = ext3_journal_restart(handle, blocks_for_truncate(inode));
		mutex_lock(&EXT3_I(inode)->truncate_mutex);
		return ret;
		}

		/*
		@@ -2072,7 +2083,7 @@ static void ext3_clear_blocks(handle_t handle, struct inode inode,
		ext3_journal_dirty_metadata(handle, bh);
		}
		ext3_mark_inode_dirty(handle, inode);
		ext3_journal_test_restart(handle, inode);
		truncate_restart_transaction(handle, inode);
		if (bh) {
		BUFFER_TRACE(bh, "retaking write access");
		ext3_journal_get_write_access(handle, bh);
		@@ -2282,7 +2293,7 @@ static void ext3_free_branches(handle_t handle, struct inode inode,
		return;
		if (try_to_extend_transaction(handle, inode)) {
		ext3_mark_inode_dirty(handle, inode);
		ext3_journal_test_restart(handle, inode);
		truncate_restart_transaction(handle, inode);
		}

		ext3_free_blocks(handle, inode, nr, 1);
		@@ -2892,6 +2903,10 @@ static int ext3_do_update_inode(handle_t *handle,
		struct buffer_head *bh = iloc->bh;
		int err = 0, rc, block;

		again:
		/* we can't allow multiple procs in here at once, its a bit racey */
		lock_buffer(bh);

		/* For fields not not tracking in the in-memory inode,
		* initialise them to zero for new inodes. */
		if (ei->i_state & EXT3_STATE_NEW)
		@@ -2951,16 +2966,20 @@ static int ext3_do_update_inode(handle_t *handle,
		/* If this is the first large file
		* created, add a flag to the superblock.
		*/
		unlock_buffer(bh);
		err = ext3_journal_get_write_access(handle,
		EXT3_SB(sb)->s_sbh);
		if (err)
		goto out_brelse;

		ext3_update_dynamic_rev(sb);
		EXT3_SET_RO_COMPAT_FEATURE(sb,
		EXT3_FEATURE_RO_COMPAT_LARGE_FILE);
		handle->h_sync = 1;
		err = ext3_journal_dirty_metadata(handle,
		EXT3_SB(sb)->s_sbh);
		/* get our lock and start over */
		goto again;
		}
		}
		}
		@@ -2983,6 +3002,7 @@ static int ext3_do_update_inode(handle_t *handle,
		raw_inode->i_extra_isize = cpu_to_le16(ei->i_extra_isize);

		BUFFER_TRACE(bh, "call ext3_journal_dirty_metadata");
		unlock_buffer(bh);
		rc = ext3_journal_dirty_metadata(handle, bh);
		if (!err)
		err = rc;

fs/jbd/checkpoint.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -456,7 +456,7 @@ int cleanup_journal_tail(journal_t *journal)
		{
		transaction_t * transaction;
		tid_t first_tid;
		unsigned long blocknr, freed;
		unsigned int blocknr, freed;

		if (is_journal_aborted(journal))
		return 1;
		@@ -502,8 +502,8 @@ int cleanup_journal_tail(journal_t *journal)
		freed = freed + journal->j_last - journal->j_first;

		jbd_debug(1,
		"Cleaning journal tail from %d to %d (offset %lu), "
		"freeing %lu\n",
		"Cleaning journal tail from %d to %d (offset %u), "
		"freeing %u\n",
		journal->j_tail_sequence, first_tid, blocknr, freed);

		journal->j_free += freed;

fs/jbd/commit.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -308,7 +308,7 @@ void journal_commit_transaction(journal_t *journal)
		int bufs;
		int flags;
		int err;
		unsigned long blocknr;
		unsigned int blocknr;
		ktime_t start_time;
		u64 commit_time;
		char *tagp = NULL;

Admin message