bmap.c (8c57a5e7b2820f349c95b8c8393fec1e0f4070d2) bmap.c (70246286e94c335b5bea0cbc68a17a96dd620281)
1/*
2 * Copyright (C) Sistina Software, Inc. 1997-2003 All rights reserved.
3 * Copyright (C) 2004-2006 Red Hat, Inc. All rights reserved.
4 *
5 * This copyrighted material is made available to anyone wishing to use,
6 * modify, copy, or redistribute it subject to the terms and conditions
7 * of the GNU General Public License version 2.
8 */

--- 271 unchanged lines hidden (view full) ---

280 for (t = pos; t < endp; t++) {
281 if (!*t)
282 continue;
283
284 rabh = gfs2_getbuf(gl, be64_to_cpu(*t), CREATE);
285 if (trylock_buffer(rabh)) {
286 if (!buffer_uptodate(rabh)) {
287 rabh->b_end_io = end_buffer_read_sync;
1/*
2 * Copyright (C) Sistina Software, Inc. 1997-2003 All rights reserved.
3 * Copyright (C) 2004-2006 Red Hat, Inc. All rights reserved.
4 *
5 * This copyrighted material is made available to anyone wishing to use,
6 * modify, copy, or redistribute it subject to the terms and conditions
7 * of the GNU General Public License version 2.
8 */

--- 271 unchanged lines hidden (view full) ---

280 for (t = pos; t < endp; t++) {
281 if (!*t)
282 continue;
283
284 rabh = gfs2_getbuf(gl, be64_to_cpu(*t), CREATE);
285 if (trylock_buffer(rabh)) {
286 if (!buffer_uptodate(rabh)) {
287 rabh->b_end_io = end_buffer_read_sync;
288 submit_bh(READA | REQ_META, rabh);
288 submit_bh(REQ_OP_READ, REQ_RAHEAD | REQ_META,
289 rabh);
289 continue;
290 }
291 unlock_buffer(rabh);
292 }
293 brelse(rabh);
294 }
295}
296

--- 672 unchanged lines hidden (view full) ---

969 }
970
971 /* Ok, it's mapped. Make sure it's up-to-date */
972 if (PageUptodate(page))
973 set_buffer_uptodate(bh);
974
975 if (!buffer_uptodate(bh)) {
976 err = -EIO;
290 continue;
291 }
292 unlock_buffer(rabh);
293 }
294 brelse(rabh);
295 }
296}
297

--- 672 unchanged lines hidden (view full) ---

970 }
971
972 /* Ok, it's mapped. Make sure it's up-to-date */
973 if (PageUptodate(page))
974 set_buffer_uptodate(bh);
975
976 if (!buffer_uptodate(bh)) {
977 err = -EIO;
977 ll_rw_block(READ, 1, &bh);
978 ll_rw_block(REQ_OP_READ, 0, 1, &bh);
978 wait_on_buffer(bh);
979 /* Uhhuh. Read error. Complain and punt. */
980 if (!buffer_uptodate(bh))
981 goto unlock;
982 err = 0;
983 }
984
985 if (!gfs2_is_writeback(ip))

--- 505 unchanged lines hidden --- 		979 wait_on_buffer(bh);
980 /* Uhhuh. Read error. Complain and punt. */
981 if (!buffer_uptodate(bh))
982 goto unlock;
983 err = 0;
984 }
985
986 if (!gfs2_is_writeback(ip))

--- 505 unchanged lines hidden ---