diff --git a/[refs] b/[refs] index 768664a2b49f..3862ec4a5dfe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6dbd822487d0a9f14432cb4680415b80656b63a2 +refs/heads/master: 598278bd4808ed81b0e6fa445458a7d549f72a32 diff --git a/trunk/fs/gfs2/incore.h b/trunk/fs/gfs2/incore.h index 4cdda1a3e12c..513aaf0dc0ab 100644 --- a/trunk/fs/gfs2/incore.h +++ b/trunk/fs/gfs2/incore.h @@ -267,7 +267,6 @@ struct gfs2_inode { struct gfs2_alloc *i_alloc; u64 i_last_rg_alloc; - spinlock_t i_spin; struct rw_semaphore i_rw_mutex; }; diff --git a/trunk/fs/gfs2/main.c b/trunk/fs/gfs2/main.c index 88686fcdfb1b..9c7765c12d62 100644 --- a/trunk/fs/gfs2/main.c +++ b/trunk/fs/gfs2/main.c @@ -29,7 +29,6 @@ static void gfs2_init_inode_once(struct kmem_cache *cachep, void *foo) struct gfs2_inode *ip = foo; inode_init_once(&ip->i_inode); - spin_lock_init(&ip->i_spin); init_rwsem(&ip->i_rw_mutex); ip->i_alloc = NULL; }