diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-08 02:59:00 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-08 02:59:00 +0000 |
| commit | 1fcb7623bc138d780101d7a70cfe29b11f7c67ef (patch) | |
| tree | e1ec9bb6aa19db16a405fb4393e2a90c38b4c75d /fs/minix | |
| parent | 458fe58677afb17219d864e100131728038b4f1b (diff) | |
Merge with Linux 2.4.0-test3-pre5. 64-bit kernel are still not
-Werror clean.
Diffstat (limited to 'fs/minix')
| -rw-r--r-- | fs/minix/bitmap.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/minix/bitmap.c b/fs/minix/bitmap.c index ca30b7753..fa2bd5f03 100644 --- a/fs/minix/bitmap.c +++ b/fs/minix/bitmap.c @@ -80,7 +80,7 @@ void minix_free_block(struct inode * inode, int block) return; } bh = sb->u.minix_sb.s_zmap[zone]; - if (!minix_clear_bit(bit,bh->b_data)) + if (!minix_test_and_clear_bit(bit,bh->b_data)) printk("free_block (%s:%d): bit already cleared\n", kdevname(sb->s_dev), block); else @@ -112,7 +112,7 @@ repeat: } if (!bh || j >= 8192) return 0; - if (minix_set_bit(j,bh->b_data)) { + if (minix_test_and_set_bit(j,bh->b_data)) { printk("new_block: bit already set"); DQUOT_FREE_BLOCK(sb, inode, 1); goto repeat; @@ -221,7 +221,7 @@ void minix_free_inode(struct inode * inode) bh = inode->i_sb->u.minix_sb.s_imap[ino >> 13]; minix_clear_inode(inode); clear_inode(inode); - if (!minix_clear_bit(ino & 8191, bh->b_data)) + if (!minix_test_and_clear_bit(ino & 8191, bh->b_data)) printk("free_inode: bit %lu already cleared.\n",ino); mark_buffer_dirty(bh, 1); } @@ -252,7 +252,7 @@ struct inode * minix_new_inode(const struct inode * dir, int * error) unlock_super(sb); return NULL; } - if (minix_set_bit(j,bh->b_data)) { /* shouldn't happen */ + if (minix_test_and_set_bit(j,bh->b_data)) { /* shouldn't happen */ printk("new_inode: bit already set"); iput(inode); unlock_super(sb); |