diff options
author | Jiri Kosina <jkosina@suse.cz> | 2010-03-08 10:55:37 -0500 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2010-03-08 10:55:37 -0500 |
commit | 318ae2edc3b29216abd8a2510f3f80b764f06858 (patch) | |
tree | ce595adde342f57f379d277b25e4dd206988a052 /fs/reiserfs/bitmap.c | |
parent | 25cf84cf377c0aae5dbcf937ea89bc7893db5176 (diff) | |
parent | 3e58974027b04e84f68b964ef368a6cd758e2f84 (diff) |
Merge branch 'for-next' into for-linus
Conflicts:
Documentation/filesystems/proc.txt
arch/arm/mach-u300/include/mach/debug-macro.S
drivers/net/qlge/qlge_ethtool.c
drivers/net/qlge/qlge_main.c
drivers/net/typhoon.c
Diffstat (limited to 'fs/reiserfs/bitmap.c')
-rw-r--r-- | fs/reiserfs/bitmap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/reiserfs/bitmap.c b/fs/reiserfs/bitmap.c index dc014f7def05..483442e66ed6 100644 --- a/fs/reiserfs/bitmap.c +++ b/fs/reiserfs/bitmap.c | |||
@@ -169,7 +169,7 @@ static int scan_bitmap_block(struct reiserfs_transaction_handle *th, | |||
169 | return 0; // No free blocks in this bitmap | 169 | return 0; // No free blocks in this bitmap |
170 | } | 170 | } |
171 | 171 | ||
172 | /* search for a first zero bit -- beggining of a window */ | 172 | /* search for a first zero bit -- beginning of a window */ |
173 | *beg = reiserfs_find_next_zero_le_bit | 173 | *beg = reiserfs_find_next_zero_le_bit |
174 | ((unsigned long *)(bh->b_data), boundary, *beg); | 174 | ((unsigned long *)(bh->b_data), boundary, *beg); |
175 | 175 | ||