From a3b1824d49a24b1484f804d0671ccb86c8c8140a Mon Sep 17 00:00:00 2001 From: Ryusuke Konishi Date: Fri, 19 Jun 2009 02:53:56 +0900 Subject: [PATCH] --- yaml --- r: 155239 b: refs/heads/master c: ff54de363afa4583e2a6249f25fe21dfaeb11ea2 h: refs/heads/master i: 155237: cda8fef27e3e057ad0dd15b587a620f6674d997d 155235: d4c993d977231c7d13d5b317a62019788480851f 155231: 305d9f184d1e38d1c03597b1148017170e93a3cf v: v3 --- [refs] | 2 +- trunk/fs/nilfs2/bmap.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index be5570bc2a93..ad060be79721 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4a52df779700080de4afb0436d9dd9188514a69b +refs/heads/master: ff54de363afa4583e2a6249f25fe21dfaeb11ea2 diff --git a/trunk/fs/nilfs2/bmap.c b/trunk/fs/nilfs2/bmap.c index 36df60b6d8a4..99d58a028b94 100644 --- a/trunk/fs/nilfs2/bmap.c +++ b/trunk/fs/nilfs2/bmap.c @@ -568,6 +568,7 @@ void nilfs_bmap_abort_update_v(struct nilfs_bmap *bmap, } static struct lock_class_key nilfs_bmap_dat_lock_key; +static struct lock_class_key nilfs_bmap_mdt_lock_key; /** * nilfs_bmap_read - read a bmap from an inode @@ -603,7 +604,11 @@ int nilfs_bmap_read(struct nilfs_bmap *bmap, struct nilfs_inode *raw_inode) bmap->b_ptr_type = NILFS_BMAP_PTR_VS; bmap->b_last_allocated_key = 0; bmap->b_last_allocated_ptr = NILFS_BMAP_INVALID_PTR; + lockdep_set_class(&bmap->b_sem, &nilfs_bmap_mdt_lock_key); break; + case NILFS_IFILE_INO: + lockdep_set_class(&bmap->b_sem, &nilfs_bmap_mdt_lock_key); + /* Fall through */ default: bmap->b_ptr_type = NILFS_BMAP_PTR_VM; bmap->b_last_allocated_key = 0;