diff options
| author |   Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-04 09:34:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-04 09:34:00 -0700 |
| commit | dd7205ed0f022a2a5e60eb7404e6c9f49d2301c3 (patch) | |
| tree | 773021ad63126ff2dacff654bd41b03a4ad6389e /fs/ntfs/bitmap.c | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff) | |
| parent | NTFS: Fix a 64-bitness bug where a left-shift could overflow a 32-bit variable (diff) | |
| download | linux-dev-dd7205ed0f022a2a5e60eb7404e6c9f49d2301c3.tar.xz linux-dev-dd7205ed0f022a2a5e60eb7404e6c9f49d2301c3.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/aia21/ntfs-2.6
Diffstat (limited to 'fs/ntfs/bitmap.c')
| -rw-r--r-- | fs/ntfs/bitmap.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/ntfs/bitmap.c b/fs/ntfs/bitmap.c index 12cf2e30c7dd..7a190cdc60e2 100644 --- a/fs/ntfs/bitmap.c +++ b/fs/ntfs/bitmap.c @@ -1,7 +1,7 @@ /* * bitmap.c - NTFS kernel bitmap handling. Part of the Linux-NTFS project. * - * Copyright (c) 2004 Anton Altaparmakov + * Copyright (c) 2004-2005 Anton Altaparmakov * * This program/include file is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as published @@ -90,7 +90,8 @@ int __ntfs_bitmap_set_bits_in_run(struct inode *vi, const s64 start_bit, /* If the first byte is partial, modify the appropriate bits in it. */ if (bit) { u8 *byte = kaddr + pos; - while ((bit & 7) && cnt--) { + while ((bit & 7) && cnt) { + cnt--; if (value) *byte |= 1 << bit++; else |