diff options
author | Ralf Baechle <ralf@linux-mips.org> | 1999-07-05 23:09:37 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 1999-07-05 23:09:37 +0000 |
commit | aba344fdfed81b2c03d6114c54cfd73a486aa10b (patch) | |
tree | d032d8430bf1234c3ecc6f6330d6de6e887e5963 /fs/minix/truncate.c | |
parent | 40c138bfc6d37dbff5339f84575db1e3cec6e34e (diff) |
Merge with Linux 2.3.9.
Diffstat (limited to 'fs/minix/truncate.c')
-rw-r--r-- | fs/minix/truncate.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/minix/truncate.c b/fs/minix/truncate.c index 4718e092e..6724d0064 100644 --- a/fs/minix/truncate.c +++ b/fs/minix/truncate.c @@ -33,7 +33,7 @@ */ #define DATA_BUFFER_USED(bh) \ - ((bh->b_count > 1) || buffer_locked(bh)) + (atomic_read(&bh->b_count) || buffer_locked(bh)) /* * The functions for minix V1 fs truncation. @@ -121,7 +121,7 @@ repeat: if (*(ind++)) break; if (i >= 512) { - if (ind_bh->b_count != 1) + if (atomic_read(&ind_bh->b_count) != 1) retry = 1; else { tmp = *p; @@ -166,7 +166,7 @@ repeat: if (*(dind++)) break; if (i >= 512) { - if (dind_bh->b_count != 1) + if (atomic_read(&dind_bh->b_count) != 1) retry = 1; else { tmp = *p; @@ -285,7 +285,7 @@ repeat: if (*(ind++)) break; if (i >= 256) { - if (ind_bh->b_count != 1) + if (atomic_read(&ind_bh->b_count) != 1) retry = 1; else { tmp = *p; @@ -330,7 +330,7 @@ repeat: if (*(dind++)) break; if (i >= 256) { - if (dind_bh->b_count != 1) + if (atomic_read(&dind_bh->b_count) != 1) retry = 1; else { tmp = *p; @@ -376,7 +376,7 @@ repeat: if (*(tind++)) break; if (i >= 256) { - if (tind_bh->b_count != 1) + if (atomic_read(&tind_bh->b_count) != 1) retry = 1; else { tmp = *p; |