From e7bb9c3e601a7c830d0c92242d3053c290af8c63 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Mon, 10 Jan 2011 12:13:42 -0500 Subject: [PATCH] --- yaml --- r: 229127 b: refs/heads/master c: 8a2005d3f84457b7d7d8646ab5195341d9e5f06a h: refs/heads/master i: 229125: cf424bd497c05ffa725ba0547527cfa15d026aa8 229123: fa1b4122ad6c202a27f3da98bcf0aa648d25e094 229119: a77a20668cb84fb01a5e93eb346e441c0ff751df v: v3 --- [refs] | 2 +- trunk/fs/ext4/ext4.h | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index c860acf647a6..bbe28d818424 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b05e6ae58a13b56e3e11882c1fc71948c9b29760 +refs/heads/master: 8a2005d3f84457b7d7d8646ab5195341d9e5f06a diff --git a/trunk/fs/ext4/ext4.h b/trunk/fs/ext4/ext4.h index de937fc10503..50e3d24483fb 100644 --- a/trunk/fs/ext4/ext4.h +++ b/trunk/fs/ext4/ext4.h @@ -763,10 +763,10 @@ struct ext4_inode_info { * near to their parent directory's inode. */ ext4_group_t i_block_group; + ext4_lblk_t i_dir_start_lookup; unsigned long i_state_flags; /* Dynamic state flags */ unsigned long i_flags; - ext4_lblk_t i_dir_start_lookup; #ifdef CONFIG_EXT4_FS_XATTR /* * Extended attributes can be read independently of the main file @@ -835,7 +835,6 @@ struct ext4_inode_info { /* on-disk additional length */ __u16 i_extra_isize; - spinlock_t i_block_reservation_lock; #ifdef CONFIG_QUOTA /* quota space reservation, managed internally by quota code */ qsize_t i_reserved_quota; @@ -844,9 +843,11 @@ struct ext4_inode_info { /* completed IOs that might need unwritten extents handling */ struct list_head i_completed_io_list; spinlock_t i_completed_io_lock; + atomic_t i_ioend_count; /* Number of outstanding io_end structs */ /* current io_end structure for async DIO write*/ ext4_io_end_t *cur_aio_dio; - atomic_t i_ioend_count; /* Number of outstanding io_end structs */ + + spinlock_t i_block_reservation_lock; /* * Transactions that contain inode's metadata needed to complete