diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-18 06:20:23 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-18 06:20:23 -0400 |
| commit | cd569ef5d6ff9f43e9504f1ffc7fdbe356518149 (patch) | |
| tree | 9a4ab5e600fd09e991aa1fbb69adb1c7950898a4 /fs/ocfs2/localalloc.c | |
| parent | 6879827f4e08da219c99b91e4e1d793a924103e3 (diff) | |
| parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) | |
Merge branch 'linus' into x86/urgent
Diffstat (limited to 'fs/ocfs2/localalloc.c')
| -rw-r--r-- | fs/ocfs2/localalloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ocfs2/localalloc.c b/fs/ocfs2/localalloc.c index be774bdc8b36..28e492e4ec88 100644 --- a/fs/ocfs2/localalloc.c +++ b/fs/ocfs2/localalloc.c | |||
| @@ -498,7 +498,7 @@ int ocfs2_reserve_local_alloc_bits(struct ocfs2_super *osb, | |||
| 498 | 498 | ||
| 499 | alloc = (struct ocfs2_dinode *) osb->local_alloc_bh->b_data; | 499 | alloc = (struct ocfs2_dinode *) osb->local_alloc_bh->b_data; |
| 500 | 500 | ||
| 501 | #ifdef OCFS2_DEBUG_FS | 501 | #ifdef CONFIG_OCFS2_DEBUG_FS |
| 502 | if (le32_to_cpu(alloc->id1.bitmap1.i_used) != | 502 | if (le32_to_cpu(alloc->id1.bitmap1.i_used) != |
| 503 | ocfs2_local_alloc_count_bits(alloc)) { | 503 | ocfs2_local_alloc_count_bits(alloc)) { |
| 504 | ocfs2_error(osb->sb, "local alloc inode %llu says it has " | 504 | ocfs2_error(osb->sb, "local alloc inode %llu says it has " |