diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 04:29:00 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 04:29:00 -0500 |
| commit | 9caafa6c8686e319cf4d5f3757b3972c6c522b7c (patch) | |
| tree | b38979b835b5d22e681b175d0b98a3c7560d9c59 /fs/fat/misc.c | |
| parent | 51e9f2ff83df6b1c81c5c44f4486c68ed87aa20e (diff) | |
| parent | cac0e8e8bb2e7a086643bdd00c41d900a79bb4fa (diff) | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'fs/fat/misc.c')
| -rw-r--r-- | fs/fat/misc.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/fs/fat/misc.c b/fs/fat/misc.c index 32fb0a3f1da4..944652e9dde1 100644 --- a/fs/fat/misc.c +++ b/fs/fat/misc.c | |||
| @@ -196,19 +196,9 @@ EXPORT_SYMBOL_GPL(fat_date_unix2dos); | |||
| 196 | 196 | ||
| 197 | int fat_sync_bhs(struct buffer_head **bhs, int nr_bhs) | 197 | int fat_sync_bhs(struct buffer_head **bhs, int nr_bhs) |
| 198 | { | 198 | { |
| 199 | int i, e, err = 0; | 199 | int i, err = 0; |
| 200 | 200 | ||
| 201 | for (i = 0; i < nr_bhs; i++) { | 201 | ll_rw_block(SWRITE, nr_bhs, bhs); |
| 202 | lock_buffer(bhs[i]); | ||
| 203 | if (test_clear_buffer_dirty(bhs[i])) { | ||
| 204 | get_bh(bhs[i]); | ||
| 205 | bhs[i]->b_end_io = end_buffer_write_sync; | ||
| 206 | e = submit_bh(WRITE, bhs[i]); | ||
| 207 | if (!err && e) | ||
| 208 | err = e; | ||
| 209 | } else | ||
| 210 | unlock_buffer(bhs[i]); | ||
| 211 | } | ||
| 212 | for (i = 0; i < nr_bhs; i++) { | 202 | for (i = 0; i < nr_bhs; i++) { |
| 213 | wait_on_buffer(bhs[i]); | 203 | wait_on_buffer(bhs[i]); |
| 214 | if (buffer_eopnotsupp(bhs[i])) { | 204 | if (buffer_eopnotsupp(bhs[i])) { |