From bb0e998e2f9826e543bc2fb6a56cc4b92dfe255c Mon Sep 17 00:00:00 2001 From: Eric Sandeen Date: Wed, 27 Oct 2010 21:30:08 -0400 Subject: [PATCH] --- yaml --- r: 218873 b: refs/heads/master c: 640e9396566a1e1f52f2db294755a23f1e62cc97 h: refs/heads/master i: 218871: 877ea99abc48cd8031f38cad98993f58ad44453e v: v3 --- [refs] | 2 +- trunk/fs/ext4/ext4.h | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 4b83990ac71e..e68c8f480ace 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c999af2b347a55174f702702e0df814d05ef5491 +refs/heads/master: 640e9396566a1e1f52f2db294755a23f1e62cc97 diff --git a/trunk/fs/ext4/ext4.h b/trunk/fs/ext4/ext4.h index e1c01552a3df..22833691e98c 100644 --- a/trunk/fs/ext4/ext4.h +++ b/trunk/fs/ext4/ext4.h @@ -1089,7 +1089,6 @@ struct ext4_sb_info { struct completion s_kobj_unregister; /* Journaling */ - struct inode *s_journal_inode; struct journal_s *s_journal; struct list_head s_orphan; struct mutex s_orphan_lock; @@ -1122,10 +1121,7 @@ struct ext4_sb_info { /* for buddy allocator */ struct ext4_group_info ***s_group_info; struct inode *s_buddy_cache; - long s_blocks_reserved; - spinlock_t s_reserve_lock; spinlock_t s_md_lock; - tid_t s_last_transaction; unsigned short *s_mb_offsets; unsigned int *s_mb_maxs; @@ -1143,7 +1139,6 @@ struct ext4_sb_info { unsigned long s_mb_last_start; /* stats for buddy allocator */ - spinlock_t s_mb_pa_lock; atomic_t s_bal_reqs; /* number of reqs with len > 1 */ atomic_t s_bal_success; /* we found long enough chunks */ atomic_t s_bal_allocated; /* in blocks */