diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-16 11:15:58 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-16 11:15:58 +0200 |
| commit | e765ee90da62535ac7d7a97f2464f9646539d683 (patch) | |
| tree | 7a9cecce5aab958938e9a3bf46c2302d6af1958c /fs/ext4/resize.c | |
| parent | ftrace: fix "notrace" filtering priority (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 (diff) | |
| download | linux-e765ee90da62535ac7d7a97f2464f9646539d683.tar.xz linux-e765ee90da62535ac7d7a97f2464f9646539d683.zip | |
Merge branch 'linus' into tracing/ftrace
Diffstat (limited to 'fs/ext4/resize.c')
| -rw-r--r-- | fs/ext4/resize.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c index 9f086a6a472b..9ecb92f68543 100644 --- a/fs/ext4/resize.c +++ b/fs/ext4/resize.c @@ -563,7 +563,8 @@ static int reserve_backup_gdb(handle_t *handle, struct inode *inode, } blk = EXT4_SB(sb)->s_sbh->b_blocknr + 1 + EXT4_SB(sb)->s_gdb_count; - data = (__le32 *)dind->b_data + EXT4_SB(sb)->s_gdb_count; + data = (__le32 *)dind->b_data + (EXT4_SB(sb)->s_gdb_count % + EXT4_ADDR_PER_BLOCK(sb)); end = (__le32 *)dind->b_data + EXT4_ADDR_PER_BLOCK(sb); /* Get each reserved primary GDT block and verify it holds backups */ |