1 // SPDX-License-Identifier: GPL-2.0-only <<
2 /* 1 /*
3 * Copyright (C) Sistina Software, Inc. 1997- 2 * Copyright (C) Sistina Software, Inc. 1997-2003 All rights reserved.
4 * Copyright (C) 2004-2006 Red Hat, Inc. All 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.
5 */ 8 */
6 9
7 #include <linux/sched.h> 10 #include <linux/sched.h>
8 #include <linux/slab.h> 11 #include <linux/slab.h>
9 #include <linux/spinlock.h> 12 #include <linux/spinlock.h>
10 #include <linux/completion.h> 13 #include <linux/completion.h>
11 #include <linux/buffer_head.h> 14 #include <linux/buffer_head.h>
12 #include <linux/mempool.h> 15 #include <linux/mempool.h>
13 #include <linux/gfs2_ondisk.h> 16 #include <linux/gfs2_ondisk.h>
14 #include <linux/bio.h> 17 #include <linux/bio.h>
15 #include <linux/fs.h> 18 #include <linux/fs.h>
16 #include <linux/list_sort.h> 19 #include <linux/list_sort.h>
17 #include <linux/blkdev.h> <<
18 20
19 #include "bmap.h" <<
20 #include "dir.h" 21 #include "dir.h"
21 #include "gfs2.h" 22 #include "gfs2.h"
22 #include "incore.h" 23 #include "incore.h"
23 #include "inode.h" 24 #include "inode.h"
24 #include "glock.h" 25 #include "glock.h"
25 #include "glops.h" <<
26 #include "log.h" 26 #include "log.h"
27 #include "lops.h" 27 #include "lops.h"
28 #include "meta_io.h" 28 #include "meta_io.h"
29 #include "recovery.h" 29 #include "recovery.h"
30 #include "rgrp.h" 30 #include "rgrp.h"
31 #include "trans.h" 31 #include "trans.h"
32 #include "util.h" 32 #include "util.h"
33 #include "trace_gfs2.h" 33 #include "trace_gfs2.h"
34 34
35 /** 35 /**
36 * gfs2_pin - Pin a buffer in memory 36 * gfs2_pin - Pin a buffer in memory
37 * @sdp: The superblock 37 * @sdp: The superblock
38 * @bh: The buffer to be pinned 38 * @bh: The buffer to be pinned
39 * 39 *
40 * The log lock must be held when calling this 40 * The log lock must be held when calling this function
41 */ 41 */
42 void gfs2_pin(struct gfs2_sbd *sdp, struct buf 42 void gfs2_pin(struct gfs2_sbd *sdp, struct buffer_head *bh)
43 { 43 {
44 struct gfs2_bufdata *bd; 44 struct gfs2_bufdata *bd;
45 45
46 BUG_ON(!current->journal_info); 46 BUG_ON(!current->journal_info);
47 47
48 clear_buffer_dirty(bh); 48 clear_buffer_dirty(bh);
49 if (test_set_buffer_pinned(bh)) 49 if (test_set_buffer_pinned(bh))
50 gfs2_assert_withdraw(sdp, 0); 50 gfs2_assert_withdraw(sdp, 0);
51 if (!buffer_uptodate(bh)) 51 if (!buffer_uptodate(bh))
52 gfs2_io_error_bh_wd(sdp, bh); 52 gfs2_io_error_bh_wd(sdp, bh);
53 bd = bh->b_private; 53 bd = bh->b_private;
54 /* If this buffer is in the AIL and it 54 /* If this buffer is in the AIL and it has already been written
55 * to in-place disk block, remove it f 55 * to in-place disk block, remove it from the AIL.
56 */ 56 */
57 spin_lock(&sdp->sd_ail_lock); 57 spin_lock(&sdp->sd_ail_lock);
58 if (bd->bd_tr) 58 if (bd->bd_tr)
59 list_move(&bd->bd_ail_st_list, 59 list_move(&bd->bd_ail_st_list, &bd->bd_tr->tr_ail2_list);
60 spin_unlock(&sdp->sd_ail_lock); 60 spin_unlock(&sdp->sd_ail_lock);
61 get_bh(bh); 61 get_bh(bh);
62 atomic_inc(&sdp->sd_log_pinned); 62 atomic_inc(&sdp->sd_log_pinned);
63 trace_gfs2_pin(bd, 1); 63 trace_gfs2_pin(bd, 1);
64 } 64 }
65 65
66 static bool buffer_is_rgrp(const struct gfs2_b 66 static bool buffer_is_rgrp(const struct gfs2_bufdata *bd)
67 { 67 {
68 return bd->bd_gl->gl_name.ln_type == L 68 return bd->bd_gl->gl_name.ln_type == LM_TYPE_RGRP;
69 } 69 }
70 70
71 static void maybe_release_space(struct gfs2_bu 71 static void maybe_release_space(struct gfs2_bufdata *bd)
72 { 72 {
73 struct gfs2_glock *gl = bd->bd_gl; 73 struct gfs2_glock *gl = bd->bd_gl;
74 struct gfs2_sbd *sdp = gl->gl_name.ln_ 74 struct gfs2_sbd *sdp = gl->gl_name.ln_sbd;
75 struct gfs2_rgrpd *rgd = gfs2_glock2rg 75 struct gfs2_rgrpd *rgd = gfs2_glock2rgrp(gl);
76 unsigned int index = bd->bd_bh->b_bloc 76 unsigned int index = bd->bd_bh->b_blocknr - gl->gl_name.ln_number;
77 struct gfs2_bitmap *bi = rgd->rd_bits 77 struct gfs2_bitmap *bi = rgd->rd_bits + index;
78 78
79 rgrp_lock_local(rgd); <<
80 if (bi->bi_clone == NULL) 79 if (bi->bi_clone == NULL)
81 goto out; !! 80 return;
82 if (sdp->sd_args.ar_discard) 81 if (sdp->sd_args.ar_discard)
83 gfs2_rgrp_send_discards(sdp, r 82 gfs2_rgrp_send_discards(sdp, rgd->rd_data0, bd->bd_bh, bi, 1, NULL);
84 memcpy(bi->bi_clone + bi->bi_offset, 83 memcpy(bi->bi_clone + bi->bi_offset,
85 bd->bd_bh->b_data + bi->bi_offs 84 bd->bd_bh->b_data + bi->bi_offset, bi->bi_bytes);
86 clear_bit(GBF_FULL, &bi->bi_flags); 85 clear_bit(GBF_FULL, &bi->bi_flags);
87 rgd->rd_free_clone = rgd->rd_free; 86 rgd->rd_free_clone = rgd->rd_free;
88 BUG_ON(rgd->rd_free_clone < rgd->rd_re <<
89 rgd->rd_extfail_pt = rgd->rd_free; 87 rgd->rd_extfail_pt = rgd->rd_free;
90 <<
91 out: <<
92 rgrp_unlock_local(rgd); <<
93 } 88 }
94 89
95 /** 90 /**
96 * gfs2_unpin - Unpin a buffer 91 * gfs2_unpin - Unpin a buffer
97 * @sdp: the filesystem the buffer belongs to 92 * @sdp: the filesystem the buffer belongs to
98 * @bh: The buffer to unpin 93 * @bh: The buffer to unpin
99 * @tr: The system transaction being flushed !! 94 * @ai:
>> 95 * @flags: The inode dirty flags
>> 96 *
100 */ 97 */
101 98
102 static void gfs2_unpin(struct gfs2_sbd *sdp, s 99 static void gfs2_unpin(struct gfs2_sbd *sdp, struct buffer_head *bh,
103 struct gfs2_trans *tr) 100 struct gfs2_trans *tr)
104 { 101 {
105 struct gfs2_bufdata *bd = bh->b_privat 102 struct gfs2_bufdata *bd = bh->b_private;
106 103
107 BUG_ON(!buffer_uptodate(bh)); 104 BUG_ON(!buffer_uptodate(bh));
108 BUG_ON(!buffer_pinned(bh)); 105 BUG_ON(!buffer_pinned(bh));
109 106
110 lock_buffer(bh); 107 lock_buffer(bh);
111 mark_buffer_dirty(bh); 108 mark_buffer_dirty(bh);
112 clear_buffer_pinned(bh); 109 clear_buffer_pinned(bh);
113 110
114 if (buffer_is_rgrp(bd)) 111 if (buffer_is_rgrp(bd))
115 maybe_release_space(bd); 112 maybe_release_space(bd);
116 113
117 spin_lock(&sdp->sd_ail_lock); 114 spin_lock(&sdp->sd_ail_lock);
118 if (bd->bd_tr) { 115 if (bd->bd_tr) {
119 list_del(&bd->bd_ail_st_list); 116 list_del(&bd->bd_ail_st_list);
120 brelse(bh); 117 brelse(bh);
121 } else { 118 } else {
122 struct gfs2_glock *gl = bd->bd 119 struct gfs2_glock *gl = bd->bd_gl;
123 list_add(&bd->bd_ail_gl_list, 120 list_add(&bd->bd_ail_gl_list, &gl->gl_ail_list);
124 atomic_inc(&gl->gl_ail_count); 121 atomic_inc(&gl->gl_ail_count);
125 } 122 }
126 bd->bd_tr = tr; 123 bd->bd_tr = tr;
127 list_add(&bd->bd_ail_st_list, &tr->tr_ 124 list_add(&bd->bd_ail_st_list, &tr->tr_ail1_list);
128 spin_unlock(&sdp->sd_ail_lock); 125 spin_unlock(&sdp->sd_ail_lock);
129 126
130 clear_bit(GLF_LFLUSH, &bd->bd_gl->gl_f 127 clear_bit(GLF_LFLUSH, &bd->bd_gl->gl_flags);
131 trace_gfs2_pin(bd, 0); 128 trace_gfs2_pin(bd, 0);
132 unlock_buffer(bh); 129 unlock_buffer(bh);
133 atomic_dec(&sdp->sd_log_pinned); 130 atomic_dec(&sdp->sd_log_pinned);
134 } 131 }
135 132
136 void gfs2_log_incr_head(struct gfs2_sbd *sdp) !! 133 static void gfs2_log_incr_head(struct gfs2_sbd *sdp)
137 { 134 {
138 BUG_ON((sdp->sd_log_flush_head == sdp- 135 BUG_ON((sdp->sd_log_flush_head == sdp->sd_log_tail) &&
139 (sdp->sd_log_flush_head != sdp- 136 (sdp->sd_log_flush_head != sdp->sd_log_head));
140 137
141 if (++sdp->sd_log_flush_head == sdp->s 138 if (++sdp->sd_log_flush_head == sdp->sd_jdesc->jd_blocks)
142 sdp->sd_log_flush_head = 0; 139 sdp->sd_log_flush_head = 0;
143 } 140 }
144 141
145 u64 gfs2_log_bmap(struct gfs2_jdesc *jd, unsig !! 142 u64 gfs2_log_bmap(struct gfs2_sbd *sdp)
146 { 143 {
>> 144 unsigned int lbn = sdp->sd_log_flush_head;
147 struct gfs2_journal_extent *je; 145 struct gfs2_journal_extent *je;
>> 146 u64 block;
148 147
149 list_for_each_entry(je, &jd->extent_li !! 148 list_for_each_entry(je, &sdp->sd_jdesc->extent_list, list) {
150 if (lblock >= je->lblock && lb !! 149 if ((lbn >= je->lblock) && (lbn < (je->lblock + je->blocks))) {
151 return je->dblock + lb !! 150 block = je->dblock + lbn - je->lblock;
>> 151 gfs2_log_incr_head(sdp);
>> 152 return block;
>> 153 }
152 } 154 }
153 155
154 return -1; 156 return -1;
155 } 157 }
156 158
157 /** 159 /**
158 * gfs2_end_log_write_bh - end log write of pa 160 * gfs2_end_log_write_bh - end log write of pagecache data with buffers
159 * @sdp: The superblock 161 * @sdp: The superblock
160 * @bvec: The bio_vec 162 * @bvec: The bio_vec
161 * @error: The i/o status 163 * @error: The i/o status
162 * 164 *
163 * This finds the relevant buffers and unlocks 165 * This finds the relevant buffers and unlocks them and sets the
164 * error flag according to the status of the i 166 * error flag according to the status of the i/o request. This is
165 * used when the log is writing data which has 167 * used when the log is writing data which has an in-place version
166 * that is pinned in the pagecache. 168 * that is pinned in the pagecache.
167 */ 169 */
168 170
169 static void gfs2_end_log_write_bh(struct gfs2_ 171 static void gfs2_end_log_write_bh(struct gfs2_sbd *sdp,
170 struct bio_v 172 struct bio_vec *bvec,
171 blk_status_t 173 blk_status_t error)
172 { 174 {
173 struct buffer_head *bh, *next; 175 struct buffer_head *bh, *next;
174 struct page *page = bvec->bv_page; 176 struct page *page = bvec->bv_page;
175 unsigned size; 177 unsigned size;
176 178
177 bh = page_buffers(page); 179 bh = page_buffers(page);
178 size = bvec->bv_len; 180 size = bvec->bv_len;
179 while (bh_offset(bh) < bvec->bv_offset 181 while (bh_offset(bh) < bvec->bv_offset)
180 bh = bh->b_this_page; 182 bh = bh->b_this_page;
181 do { 183 do {
182 if (error) 184 if (error)
183 mark_buffer_write_io_e 185 mark_buffer_write_io_error(bh);
184 unlock_buffer(bh); 186 unlock_buffer(bh);
185 next = bh->b_this_page; 187 next = bh->b_this_page;
186 size -= bh->b_size; 188 size -= bh->b_size;
187 brelse(bh); 189 brelse(bh);
188 bh = next; 190 bh = next;
189 } while(bh && size); 191 } while(bh && size);
190 } 192 }
191 193
192 /** 194 /**
193 * gfs2_end_log_write - end of i/o to the log 195 * gfs2_end_log_write - end of i/o to the log
194 * @bio: The bio 196 * @bio: The bio
>> 197 * @error: Status of i/o request
195 * 198 *
196 * Each bio_vec contains either data from the 199 * Each bio_vec contains either data from the pagecache or data
197 * relating to the log itself. Here we iterate 200 * relating to the log itself. Here we iterate over the bio_vec
198 * array, processing both kinds of data. 201 * array, processing both kinds of data.
199 * 202 *
200 */ 203 */
201 204
202 static void gfs2_end_log_write(struct bio *bio 205 static void gfs2_end_log_write(struct bio *bio)
203 { 206 {
204 struct gfs2_sbd *sdp = bio->bi_private 207 struct gfs2_sbd *sdp = bio->bi_private;
205 struct bio_vec *bvec; 208 struct bio_vec *bvec;
206 struct page *page; 209 struct page *page;
>> 210 int i;
207 struct bvec_iter_all iter_all; 211 struct bvec_iter_all iter_all;
208 212
209 if (bio->bi_status) { 213 if (bio->bi_status) {
210 if (!cmpxchg(&sdp->sd_log_erro !! 214 fs_err(sdp, "Error %d writing to journal, jid=%u\n",
211 fs_err(sdp, "Error %d !! 215 bio->bi_status, sdp->sd_jdesc->jd_jid);
212 bio->bi_status, <<
213 gfs2_withdraw_delayed(sdp); <<
214 /* prevent more writes to the <<
215 clear_bit(SDF_JOURNAL_LIVE, &s <<
216 wake_up(&sdp->sd_logd_waitq); 216 wake_up(&sdp->sd_logd_waitq);
217 } 217 }
218 218
219 bio_for_each_segment_all(bvec, bio, it !! 219 bio_for_each_segment_all(bvec, bio, i, iter_all) {
220 page = bvec->bv_page; 220 page = bvec->bv_page;
221 if (page_has_buffers(page)) 221 if (page_has_buffers(page))
222 gfs2_end_log_write_bh( 222 gfs2_end_log_write_bh(sdp, bvec, bio->bi_status);
223 else 223 else
224 mempool_free(page, gfs 224 mempool_free(page, gfs2_page_pool);
225 } 225 }
226 226
227 bio_put(bio); 227 bio_put(bio);
228 if (atomic_dec_and_test(&sdp->sd_log_i 228 if (atomic_dec_and_test(&sdp->sd_log_in_flight))
229 wake_up(&sdp->sd_log_flush_wai 229 wake_up(&sdp->sd_log_flush_wait);
230 } 230 }
231 231
232 /** 232 /**
233 * gfs2_log_submit_bio - Submit any pending lo 233 * gfs2_log_submit_bio - Submit any pending log bio
234 * @biop: Address of the bio pointer 234 * @biop: Address of the bio pointer
235 * @opf: REQ_OP | op_flags !! 235 * @op: REQ_OP
>> 236 * @op_flags: req_flag_bits
236 * 237 *
237 * Submit any pending part-built or full bio t 238 * Submit any pending part-built or full bio to the block device. If
238 * there is no pending bio, then this is a no- 239 * there is no pending bio, then this is a no-op.
239 */ 240 */
240 241
241 void gfs2_log_submit_bio(struct bio **biop, bl !! 242 void gfs2_log_submit_bio(struct bio **biop, int op, int op_flags)
242 { 243 {
243 struct bio *bio = *biop; 244 struct bio *bio = *biop;
244 if (bio) { 245 if (bio) {
245 struct gfs2_sbd *sdp = bio->bi 246 struct gfs2_sbd *sdp = bio->bi_private;
246 atomic_inc(&sdp->sd_log_in_fli 247 atomic_inc(&sdp->sd_log_in_flight);
247 bio->bi_opf = opf; !! 248 bio_set_op_attrs(bio, op, op_flags);
248 submit_bio(bio); 249 submit_bio(bio);
249 *biop = NULL; 250 *biop = NULL;
250 } 251 }
251 } 252 }
252 253
253 /** 254 /**
254 * gfs2_log_alloc_bio - Allocate a bio 255 * gfs2_log_alloc_bio - Allocate a bio
255 * @sdp: The super block 256 * @sdp: The super block
256 * @blkno: The device block number we want to 257 * @blkno: The device block number we want to write to
257 * @end_io: The bi_end_io callback 258 * @end_io: The bi_end_io callback
258 * 259 *
259 * Allocate a new bio, initialize it with the 260 * Allocate a new bio, initialize it with the given parameters and return it.
260 * 261 *
261 * Returns: The newly allocated bio 262 * Returns: The newly allocated bio
262 */ 263 */
263 264
264 static struct bio *gfs2_log_alloc_bio(struct g 265 static struct bio *gfs2_log_alloc_bio(struct gfs2_sbd *sdp, u64 blkno,
265 bio_end_ 266 bio_end_io_t *end_io)
266 { 267 {
267 struct super_block *sb = sdp->sd_vfs; 268 struct super_block *sb = sdp->sd_vfs;
268 struct bio *bio = bio_alloc(sb->s_bdev !! 269 struct bio *bio = bio_alloc(GFP_NOIO, BIO_MAX_PAGES);
269 270
270 bio->bi_iter.bi_sector = blkno << sdp- !! 271 bio->bi_iter.bi_sector = blkno * (sb->s_blocksize >> 9);
>> 272 bio_set_dev(bio, sb->s_bdev);
271 bio->bi_end_io = end_io; 273 bio->bi_end_io = end_io;
272 bio->bi_private = sdp; 274 bio->bi_private = sdp;
273 275
274 return bio; 276 return bio;
275 } 277 }
276 278
277 /** 279 /**
278 * gfs2_log_get_bio - Get cached log bio, or a 280 * gfs2_log_get_bio - Get cached log bio, or allocate a new one
279 * @sdp: The super block 281 * @sdp: The super block
280 * @blkno: The device block number we want to 282 * @blkno: The device block number we want to write to
281 * @biop: The bio to get or allocate !! 283 * @bio: The bio to get or allocate
282 * @op: REQ_OP 284 * @op: REQ_OP
283 * @end_io: The bi_end_io callback 285 * @end_io: The bi_end_io callback
284 * @flush: Always flush the current bio and al 286 * @flush: Always flush the current bio and allocate a new one?
285 * 287 *
286 * If there is a cached bio, then if the next 288 * If there is a cached bio, then if the next block number is sequential
287 * with the previous one, return it, otherwise 289 * with the previous one, return it, otherwise flush the bio to the
288 * device. If there is no cached bio, or we ju 290 * device. If there is no cached bio, or we just flushed it, then
289 * allocate a new one. 291 * allocate a new one.
290 * 292 *
291 * Returns: The bio to use for log writes 293 * Returns: The bio to use for log writes
292 */ 294 */
293 295
294 static struct bio *gfs2_log_get_bio(struct gfs 296 static struct bio *gfs2_log_get_bio(struct gfs2_sbd *sdp, u64 blkno,
295 struct bio !! 297 struct bio **biop, int op,
296 bio_end_io 298 bio_end_io_t *end_io, bool flush)
297 { 299 {
298 struct bio *bio = *biop; 300 struct bio *bio = *biop;
299 301
300 if (bio) { 302 if (bio) {
301 u64 nblk; 303 u64 nblk;
302 304
303 nblk = bio_end_sector(bio); 305 nblk = bio_end_sector(bio);
304 nblk >>= sdp->sd_fsb2bb_shift; 306 nblk >>= sdp->sd_fsb2bb_shift;
305 if (blkno == nblk && !flush) 307 if (blkno == nblk && !flush)
306 return bio; 308 return bio;
307 gfs2_log_submit_bio(biop, op); !! 309 gfs2_log_submit_bio(biop, op, 0);
308 } 310 }
309 311
310 *biop = gfs2_log_alloc_bio(sdp, blkno, 312 *biop = gfs2_log_alloc_bio(sdp, blkno, end_io);
311 return *biop; 313 return *biop;
312 } 314 }
313 315
314 /** 316 /**
315 * gfs2_log_write - write to log 317 * gfs2_log_write - write to log
316 * @sdp: the filesystem 318 * @sdp: the filesystem
317 * @jd: The journal descriptor <<
318 * @page: the page to write 319 * @page: the page to write
319 * @size: the size of the data to write 320 * @size: the size of the data to write
320 * @offset: the offset within the page 321 * @offset: the offset within the page
321 * @blkno: block number of the log entry 322 * @blkno: block number of the log entry
322 * 323 *
323 * Try and add the page segment to the current 324 * Try and add the page segment to the current bio. If that fails,
324 * submit the current bio to the device and cr 325 * submit the current bio to the device and create a new one, and
325 * then add the page segment to that. 326 * then add the page segment to that.
326 */ 327 */
327 328
328 void gfs2_log_write(struct gfs2_sbd *sdp, stru !! 329 void gfs2_log_write(struct gfs2_sbd *sdp, struct page *page,
329 struct page *page, unsigne !! 330 unsigned size, unsigned offset, u64 blkno)
330 u64 blkno) <<
331 { 331 {
332 struct bio *bio; 332 struct bio *bio;
333 int ret; 333 int ret;
334 334
335 bio = gfs2_log_get_bio(sdp, blkno, &jd !! 335 bio = gfs2_log_get_bio(sdp, blkno, &sdp->sd_log_bio, REQ_OP_WRITE,
336 gfs2_end_log_wr 336 gfs2_end_log_write, false);
337 ret = bio_add_page(bio, page, size, of 337 ret = bio_add_page(bio, page, size, offset);
338 if (ret == 0) { 338 if (ret == 0) {
339 bio = gfs2_log_get_bio(sdp, bl !! 339 bio = gfs2_log_get_bio(sdp, blkno, &sdp->sd_log_bio,
340 REQ_OP_ 340 REQ_OP_WRITE, gfs2_end_log_write, true);
341 ret = bio_add_page(bio, page, 341 ret = bio_add_page(bio, page, size, offset);
342 WARN_ON(ret == 0); 342 WARN_ON(ret == 0);
343 } 343 }
344 } 344 }
345 345
346 /** 346 /**
347 * gfs2_log_write_bh - write a buffer's conten 347 * gfs2_log_write_bh - write a buffer's content to the log
348 * @sdp: The super block 348 * @sdp: The super block
349 * @bh: The buffer pointing to the in-place lo 349 * @bh: The buffer pointing to the in-place location
350 * 350 *
351 * This writes the content of the buffer to th 351 * This writes the content of the buffer to the next available location
352 * in the log. The buffer will be unlocked onc 352 * in the log. The buffer will be unlocked once the i/o to the log has
353 * completed. 353 * completed.
354 */ 354 */
355 355
356 static void gfs2_log_write_bh(struct gfs2_sbd 356 static void gfs2_log_write_bh(struct gfs2_sbd *sdp, struct buffer_head *bh)
357 { 357 {
358 u64 dblock; !! 358 gfs2_log_write(sdp, bh->b_page, bh->b_size, bh_offset(bh),
359 !! 359 gfs2_log_bmap(sdp));
360 dblock = gfs2_log_bmap(sdp->sd_jdesc, <<
361 gfs2_log_incr_head(sdp); <<
362 gfs2_log_write(sdp, sdp->sd_jdesc, bh- <<
363 bh_offset(bh), dblock); <<
364 } 360 }
365 361
366 /** 362 /**
367 * gfs2_log_write_page - write one block store 363 * gfs2_log_write_page - write one block stored in a page, into the log
368 * @sdp: The superblock 364 * @sdp: The superblock
369 * @page: The struct page 365 * @page: The struct page
370 * 366 *
371 * This writes the first block-sized part of t 367 * This writes the first block-sized part of the page into the log. Note
372 * that the page must have been allocated from 368 * that the page must have been allocated from the gfs2_page_pool mempool
373 * and that after this has been called, owners 369 * and that after this has been called, ownership has been transferred and
374 * the page may be freed at any time. 370 * the page may be freed at any time.
375 */ 371 */
376 372
377 static void gfs2_log_write_page(struct gfs2_sb !! 373 void gfs2_log_write_page(struct gfs2_sbd *sdp, struct page *page)
378 { 374 {
379 struct super_block *sb = sdp->sd_vfs; 375 struct super_block *sb = sdp->sd_vfs;
380 u64 dblock; !! 376 gfs2_log_write(sdp, page, sb->s_blocksize, 0,
381 !! 377 gfs2_log_bmap(sdp));
382 dblock = gfs2_log_bmap(sdp->sd_jdesc, <<
383 gfs2_log_incr_head(sdp); <<
384 gfs2_log_write(sdp, sdp->sd_jdesc, pag <<
385 } <<
386 <<
387 /** <<
388 * gfs2_end_log_read - end I/O callback for re <<
389 * @bio: The bio <<
390 * <<
391 * Simply unlock the pages in the bio. The mai <<
392 * process them in order as necessary. <<
393 */ <<
394 static void gfs2_end_log_read(struct bio *bio) <<
395 { <<
396 int error = blk_status_to_errno(bio->b <<
397 struct folio_iter fi; <<
398 <<
399 bio_for_each_folio_all(fi, bio) { <<
400 /* We're abusing wb_err to get <<
401 filemap_set_wb_err(fi.folio->m <<
402 folio_end_read(fi.folio, !erro <<
403 } <<
404 <<
405 bio_put(bio); <<
406 } <<
407 <<
408 /** <<
409 * gfs2_jhead_pg_srch - Look for the journal h <<
410 * @jd: The journal descriptor <<
411 * @head: The journal head to start from <<
412 * @page: The page to look in <<
413 * <<
414 * Returns: 1 if found, 0 otherwise. <<
415 */ <<
416 <<
417 static bool gfs2_jhead_pg_srch(struct gfs2_jde <<
418 struct gfs2_log_ <<
419 struct page *pag <<
420 { <<
421 struct gfs2_sbd *sdp = GFS2_SB(jd->jd_ <<
422 struct gfs2_log_header_host lh; <<
423 void *kaddr; <<
424 unsigned int offset; <<
425 bool ret = false; <<
426 <<
427 kaddr = kmap_local_page(page); <<
428 for (offset = 0; offset < PAGE_SIZE; o <<
429 if (!__get_log_header(sdp, kad <<
430 if (lh.lh_sequence >= <<
431 *head = lh; <<
432 else { <<
433 ret = true; <<
434 break; <<
435 } <<
436 } <<
437 } <<
438 kunmap_local(kaddr); <<
439 return ret; <<
440 } <<
441 <<
442 /** <<
443 * gfs2_jhead_process_page - Search/cleanup a <<
444 * @jd: The journal descriptor <<
445 * @index: Index of the page to look into <<
446 * @head: The journal head to start from <<
447 * @done: If set, perform only cleanup, else s <<
448 * <<
449 * Find the folio with 'index' in the journal' <<
450 * the journal head if requested (cleanup == f <<
451 * folio so the page cache can reclaim it. We <<
452 * reference on this folio twice, first when w <<
453 * to obtain the folio to add it to the bio an <<
454 * filemap_get_folio() here to get the folio t <<
455 * completed. <<
456 * This function is also used to free up a fol <<
457 * used. Maybe we added it to a bio, but not s <<
458 * submitted the I/O, but we already found the <<
459 * our references to the folio. <<
460 */ <<
461 <<
462 static void gfs2_jhead_process_page(struct gfs <<
463 struct gfs <<
464 bool *done <<
465 { <<
466 struct folio *folio; <<
467 <<
468 folio = filemap_get_folio(jd->jd_inode <<
469 <<
470 folio_wait_locked(folio); <<
471 if (!folio_test_uptodate(folio)) <<
472 *done = true; <<
473 <<
474 if (!*done) <<
475 *done = gfs2_jhead_pg_srch(jd, <<
476 <<
477 /* filemap_get_folio() and the earlier <<
478 folio_put_refs(folio, 2); <<
479 } <<
480 <<
481 static struct bio *gfs2_chain_bio(struct bio * <<
482 { <<
483 struct bio *new; <<
484 <<
485 new = bio_alloc(prev->bi_bdev, nr_iove <<
486 bio_clone_blkg_association(new, prev); <<
487 new->bi_iter.bi_sector = bio_end_secto <<
488 bio_chain(new, prev); <<
489 submit_bio(prev); <<
490 return new; <<
491 } <<
492 <<
493 /** <<
494 * gfs2_find_jhead - find the head of a log <<
495 * @jd: The journal descriptor <<
496 * @head: The log descriptor for the head of t <<
497 * @keep_cache: If set inode pages will not be <<
498 * <<
499 * Do a search of a journal by reading it in l <<
500 * the valid log entry with the highest sequen <<
501 * <<
502 * Returns: 0 on success, errno otherwise <<
503 */ <<
504 int gfs2_find_jhead(struct gfs2_jdesc *jd, str <<
505 bool keep_cache) <<
506 { <<
507 struct gfs2_sbd *sdp = GFS2_SB(jd->jd_ <<
508 struct address_space *mapping = jd->jd <<
509 unsigned int block = 0, blocks_submitt <<
510 unsigned int bsize = sdp->sd_sb.sb_bsi <<
511 unsigned int bsize_shift = sdp->sd_sb. <<
512 unsigned int shift = PAGE_SHIFT - bsiz <<
513 unsigned int max_blocks = 2 * 1024 * 1 <<
514 struct gfs2_journal_extent *je; <<
515 int sz, ret = 0; <<
516 struct bio *bio = NULL; <<
517 struct page *page = NULL; <<
518 bool done = false; <<
519 errseq_t since; <<
520 <<
521 memset(head, 0, sizeof(*head)); <<
522 if (list_empty(&jd->extent_list)) <<
523 gfs2_map_journal_extents(sdp, <<
524 <<
525 since = filemap_sample_wb_err(mapping) <<
526 list_for_each_entry(je, &jd->extent_li <<
527 u64 dblock = je->dblock; <<
528 <<
529 for (; block < je->lblock + je <<
530 if (!page) { <<
531 page = grab_ca <<
532 if (!page) { <<
533 ret = <<
534 done = <<
535 goto o <<
536 } <<
537 off = 0; <<
538 } <<
539 <<
540 if (bio && (off || blo <<
541 sector_t secto <<
542 <<
543 if (bio_end_se <<
544 sz = b <<
545 if (sz <<
546 <<
547 } <<
548 if (off) { <<
549 unsign <<
550 <<
551 <<
552 bio = <<
553 goto a <<
554 } <<
555 } <<
556 <<
557 if (bio) { <<
558 blocks_submitt <<
559 submit_bio(bio <<
560 } <<
561 <<
562 bio = gfs2_log_alloc_b <<
563 bio->bi_opf = REQ_OP_R <<
564 add_block_to_new_bio: <<
565 sz = bio_add_page(bio, <<
566 BUG_ON(sz != bsize); <<
567 block_added: <<
568 off += bsize; <<
569 if (off == PAGE_SIZE) <<
570 page = NULL; <<
571 if (blocks_submitted < <<
572 /* Keep at lea <<
573 continue; <<
574 } <<
575 <<
576 gfs2_jhead_process_pag <<
577 blocks_read += PAGE_SI <<
578 if (done) <<
579 goto out; /* <<
580 } <<
581 } <<
582 <<
583 out: <<
584 if (bio) <<
585 submit_bio(bio); <<
586 while (blocks_read < block) { <<
587 gfs2_jhead_process_page(jd, bl <<
588 blocks_read += PAGE_SIZE >> bs <<
589 } <<
590 <<
591 if (!ret) <<
592 ret = filemap_check_wb_err(map <<
593 <<
594 if (!keep_cache) <<
595 truncate_inode_pages(mapping, <<
596 <<
597 return ret; <<
598 } 378 }
599 379
600 static struct page *gfs2_get_log_desc(struct g 380 static struct page *gfs2_get_log_desc(struct gfs2_sbd *sdp, u32 ld_type,
601 u32 ld_l 381 u32 ld_length, u32 ld_data1)
602 { 382 {
603 struct page *page = mempool_alloc(gfs2 383 struct page *page = mempool_alloc(gfs2_page_pool, GFP_NOIO);
604 struct gfs2_log_descriptor *ld = page_ 384 struct gfs2_log_descriptor *ld = page_address(page);
605 clear_page(ld); 385 clear_page(ld);
606 ld->ld_header.mh_magic = cpu_to_be32(G 386 ld->ld_header.mh_magic = cpu_to_be32(GFS2_MAGIC);
607 ld->ld_header.mh_type = cpu_to_be32(GF 387 ld->ld_header.mh_type = cpu_to_be32(GFS2_METATYPE_LD);
608 ld->ld_header.mh_format = cpu_to_be32( 388 ld->ld_header.mh_format = cpu_to_be32(GFS2_FORMAT_LD);
609 ld->ld_type = cpu_to_be32(ld_type); 389 ld->ld_type = cpu_to_be32(ld_type);
610 ld->ld_length = cpu_to_be32(ld_length) 390 ld->ld_length = cpu_to_be32(ld_length);
611 ld->ld_data1 = cpu_to_be32(ld_data1); 391 ld->ld_data1 = cpu_to_be32(ld_data1);
612 ld->ld_data2 = 0; 392 ld->ld_data2 = 0;
613 return page; 393 return page;
614 } 394 }
615 395
616 static void gfs2_check_magic(struct buffer_hea 396 static void gfs2_check_magic(struct buffer_head *bh)
617 { 397 {
618 void *kaddr; 398 void *kaddr;
619 __be32 *ptr; 399 __be32 *ptr;
620 400
621 clear_buffer_escaped(bh); 401 clear_buffer_escaped(bh);
622 kaddr = kmap_local_page(bh->b_page); !! 402 kaddr = kmap_atomic(bh->b_page);
623 ptr = kaddr + bh_offset(bh); 403 ptr = kaddr + bh_offset(bh);
624 if (*ptr == cpu_to_be32(GFS2_MAGIC)) 404 if (*ptr == cpu_to_be32(GFS2_MAGIC))
625 set_buffer_escaped(bh); 405 set_buffer_escaped(bh);
626 kunmap_local(kaddr); !! 406 kunmap_atomic(kaddr);
627 } 407 }
628 408
629 static int blocknr_cmp(void *priv, const struc !! 409 static int blocknr_cmp(void *priv, struct list_head *a, struct list_head *b)
630 const struct list_head <<
631 { 410 {
632 struct gfs2_bufdata *bda, *bdb; 411 struct gfs2_bufdata *bda, *bdb;
633 412
634 bda = list_entry(a, struct gfs2_bufdat 413 bda = list_entry(a, struct gfs2_bufdata, bd_list);
635 bdb = list_entry(b, struct gfs2_bufdat 414 bdb = list_entry(b, struct gfs2_bufdata, bd_list);
636 415
637 if (bda->bd_bh->b_blocknr < bdb->bd_bh 416 if (bda->bd_bh->b_blocknr < bdb->bd_bh->b_blocknr)
638 return -1; 417 return -1;
639 if (bda->bd_bh->b_blocknr > bdb->bd_bh 418 if (bda->bd_bh->b_blocknr > bdb->bd_bh->b_blocknr)
640 return 1; 419 return 1;
641 return 0; 420 return 0;
642 } 421 }
643 422
644 static void gfs2_before_commit(struct gfs2_sbd 423 static void gfs2_before_commit(struct gfs2_sbd *sdp, unsigned int limit,
645 unsigned int t 424 unsigned int total, struct list_head *blist,
646 bool is_databu 425 bool is_databuf)
647 { 426 {
648 struct gfs2_log_descriptor *ld; 427 struct gfs2_log_descriptor *ld;
649 struct gfs2_bufdata *bd1 = NULL, *bd2; 428 struct gfs2_bufdata *bd1 = NULL, *bd2;
650 struct page *page; 429 struct page *page;
651 unsigned int num; 430 unsigned int num;
652 unsigned n; 431 unsigned n;
653 __be64 *ptr; 432 __be64 *ptr;
654 433
655 gfs2_log_lock(sdp); 434 gfs2_log_lock(sdp);
656 list_sort(NULL, blist, blocknr_cmp); 435 list_sort(NULL, blist, blocknr_cmp);
657 bd1 = bd2 = list_prepare_entry(bd1, bl 436 bd1 = bd2 = list_prepare_entry(bd1, blist, bd_list);
658 while(total) { 437 while(total) {
659 num = total; 438 num = total;
660 if (total > limit) 439 if (total > limit)
661 num = limit; 440 num = limit;
662 gfs2_log_unlock(sdp); 441 gfs2_log_unlock(sdp);
663 page = gfs2_get_log_desc(sdp, 442 page = gfs2_get_log_desc(sdp,
664 is_da 443 is_databuf ? GFS2_LOG_DESC_JDATA :
665 GFS2_ 444 GFS2_LOG_DESC_METADATA, num + 1, num);
666 ld = page_address(page); 445 ld = page_address(page);
667 gfs2_log_lock(sdp); 446 gfs2_log_lock(sdp);
668 ptr = (__be64 *)(ld + 1); 447 ptr = (__be64 *)(ld + 1);
669 448
670 n = 0; 449 n = 0;
671 list_for_each_entry_continue(b 450 list_for_each_entry_continue(bd1, blist, bd_list) {
672 *ptr++ = cpu_to_be64(b 451 *ptr++ = cpu_to_be64(bd1->bd_bh->b_blocknr);
673 if (is_databuf) { 452 if (is_databuf) {
674 gfs2_check_mag 453 gfs2_check_magic(bd1->bd_bh);
675 *ptr++ = cpu_t 454 *ptr++ = cpu_to_be64(buffer_escaped(bd1->bd_bh) ? 1 : 0);
676 } 455 }
677 if (++n >= num) 456 if (++n >= num)
678 break; 457 break;
679 } 458 }
680 459
681 gfs2_log_unlock(sdp); 460 gfs2_log_unlock(sdp);
682 gfs2_log_write_page(sdp, page) 461 gfs2_log_write_page(sdp, page);
683 gfs2_log_lock(sdp); 462 gfs2_log_lock(sdp);
684 463
685 n = 0; 464 n = 0;
686 list_for_each_entry_continue(b 465 list_for_each_entry_continue(bd2, blist, bd_list) {
687 get_bh(bd2->bd_bh); 466 get_bh(bd2->bd_bh);
688 gfs2_log_unlock(sdp); 467 gfs2_log_unlock(sdp);
689 lock_buffer(bd2->bd_bh 468 lock_buffer(bd2->bd_bh);
690 469
691 if (buffer_escaped(bd2 470 if (buffer_escaped(bd2->bd_bh)) {
692 void *p; !! 471 void *kaddr;
693 <<
694 page = mempool 472 page = mempool_alloc(gfs2_page_pool, GFP_NOIO);
695 p = page_addre !! 473 ptr = page_address(page);
696 memcpy_from_pa !! 474 kaddr = kmap_atomic(bd2->bd_bh->b_page);
697 *(__be32 *)p = !! 475 memcpy(ptr, kaddr + bh_offset(bd2->bd_bh),
>> 476 bd2->bd_bh->b_size);
>> 477 kunmap_atomic(kaddr);
>> 478 *(__be32 *)ptr = 0;
698 clear_buffer_e 479 clear_buffer_escaped(bd2->bd_bh);
699 unlock_buffer( 480 unlock_buffer(bd2->bd_bh);
700 brelse(bd2->bd 481 brelse(bd2->bd_bh);
701 gfs2_log_write 482 gfs2_log_write_page(sdp, page);
702 } else { 483 } else {
703 gfs2_log_write 484 gfs2_log_write_bh(sdp, bd2->bd_bh);
704 } 485 }
705 gfs2_log_lock(sdp); 486 gfs2_log_lock(sdp);
706 if (++n >= num) 487 if (++n >= num)
707 break; 488 break;
708 } 489 }
709 490
710 BUG_ON(total < num); 491 BUG_ON(total < num);
711 total -= num; 492 total -= num;
712 } 493 }
713 gfs2_log_unlock(sdp); 494 gfs2_log_unlock(sdp);
714 } 495 }
715 496
716 static void buf_lo_before_commit(struct gfs2_s 497 static void buf_lo_before_commit(struct gfs2_sbd *sdp, struct gfs2_trans *tr)
717 { 498 {
718 unsigned int limit = buf_limit(sdp); / 499 unsigned int limit = buf_limit(sdp); /* 503 for 4k blocks */
719 unsigned int nbuf; 500 unsigned int nbuf;
720 if (tr == NULL) 501 if (tr == NULL)
721 return; 502 return;
722 nbuf = tr->tr_num_buf_new - tr->tr_num 503 nbuf = tr->tr_num_buf_new - tr->tr_num_buf_rm;
723 gfs2_before_commit(sdp, limit, nbuf, & 504 gfs2_before_commit(sdp, limit, nbuf, &tr->tr_buf, 0);
724 } 505 }
725 506
726 static void buf_lo_after_commit(struct gfs2_sb 507 static void buf_lo_after_commit(struct gfs2_sbd *sdp, struct gfs2_trans *tr)
727 { 508 {
728 struct list_head *head; 509 struct list_head *head;
729 struct gfs2_bufdata *bd; 510 struct gfs2_bufdata *bd;
730 511
731 if (tr == NULL) 512 if (tr == NULL)
732 return; 513 return;
733 514
734 head = &tr->tr_buf; 515 head = &tr->tr_buf;
735 while (!list_empty(head)) { 516 while (!list_empty(head)) {
736 bd = list_first_entry(head, st !! 517 bd = list_entry(head->next, struct gfs2_bufdata, bd_list);
737 list_del_init(&bd->bd_list); 518 list_del_init(&bd->bd_list);
738 gfs2_unpin(sdp, bd->bd_bh, tr) 519 gfs2_unpin(sdp, bd->bd_bh, tr);
739 } 520 }
740 } 521 }
741 522
742 static void buf_lo_before_scan(struct gfs2_jde 523 static void buf_lo_before_scan(struct gfs2_jdesc *jd,
743 struct gfs2_log 524 struct gfs2_log_header_host *head, int pass)
744 { 525 {
745 if (pass != 0) 526 if (pass != 0)
746 return; 527 return;
747 528
748 jd->jd_found_blocks = 0; 529 jd->jd_found_blocks = 0;
749 jd->jd_replayed_blocks = 0; 530 jd->jd_replayed_blocks = 0;
750 } 531 }
751 532
752 #define obsolete_rgrp_replay \ !! 533 static int buf_lo_scan_elements(struct gfs2_jdesc *jd, unsigned int start,
753 "Replaying 0x%llx from jid=%d/0x%llx but we al <<
754 #define obsolete_rgrp_replay2 \ <<
755 "busy:%d, pinned:%d rg_gen:0x%llx, j_gen:0x%ll <<
756 <<
757 static void obsolete_rgrp(struct gfs2_jdesc *j <<
758 u64 blkno) <<
759 { <<
760 struct gfs2_sbd *sdp = GFS2_SB(jd->jd_ <<
761 struct gfs2_rgrpd *rgd; <<
762 struct gfs2_rgrp *jrgd = (struct gfs2_ <<
763 <<
764 rgd = gfs2_blk2rgrpd(sdp, blkno, false <<
765 if (rgd && rgd->rd_addr == blkno && <<
766 rgd->rd_bits && rgd->rd_bits->bi_b <<
767 fs_info(sdp, obsolete_rgrp_rep <<
768 jd->jd_jid, bh_log->b_ <<
769 fs_info(sdp, obsolete_rgrp_rep <<
770 buffer_busy(rgd->rd_bi <<
771 buffer_pinned(rgd->rd_ <<
772 rgd->rd_igeneration, <<
773 be64_to_cpu(jrgd->rg_i <<
774 gfs2_dump_glock(NULL, rgd->rd_ <<
775 } <<
776 } <<
777 <<
778 static int buf_lo_scan_elements(struct gfs2_jd <<
779 struct gfs2_lo 534 struct gfs2_log_descriptor *ld, __be64 *ptr,
780 int pass) 535 int pass)
781 { 536 {
782 struct gfs2_inode *ip = GFS2_I(jd->jd_ 537 struct gfs2_inode *ip = GFS2_I(jd->jd_inode);
783 struct gfs2_sbd *sdp = GFS2_SB(jd->jd_ 538 struct gfs2_sbd *sdp = GFS2_SB(jd->jd_inode);
784 struct gfs2_glock *gl = ip->i_gl; 539 struct gfs2_glock *gl = ip->i_gl;
785 unsigned int blks = be32_to_cpu(ld->ld 540 unsigned int blks = be32_to_cpu(ld->ld_data1);
786 struct buffer_head *bh_log, *bh_ip; 541 struct buffer_head *bh_log, *bh_ip;
787 u64 blkno; 542 u64 blkno;
788 int error = 0; 543 int error = 0;
789 544
790 if (pass != 1 || be32_to_cpu(ld->ld_ty 545 if (pass != 1 || be32_to_cpu(ld->ld_type) != GFS2_LOG_DESC_METADATA)
791 return 0; 546 return 0;
792 547
793 gfs2_replay_incr_blk(jd, &start); 548 gfs2_replay_incr_blk(jd, &start);
794 549
795 for (; blks; gfs2_replay_incr_blk(jd, 550 for (; blks; gfs2_replay_incr_blk(jd, &start), blks--) {
796 blkno = be64_to_cpu(*ptr++); 551 blkno = be64_to_cpu(*ptr++);
797 552
798 jd->jd_found_blocks++; 553 jd->jd_found_blocks++;
799 554
800 if (gfs2_revoke_check(jd, blkn 555 if (gfs2_revoke_check(jd, blkno, start))
801 continue; 556 continue;
802 557
803 error = gfs2_replay_read_block 558 error = gfs2_replay_read_block(jd, start, &bh_log);
804 if (error) 559 if (error)
805 return error; 560 return error;
806 561
807 bh_ip = gfs2_meta_new(gl, blkn 562 bh_ip = gfs2_meta_new(gl, blkno);
808 memcpy(bh_ip->b_data, bh_log-> 563 memcpy(bh_ip->b_data, bh_log->b_data, bh_log->b_size);
809 564
810 if (gfs2_meta_check(sdp, bh_ip 565 if (gfs2_meta_check(sdp, bh_ip))
811 error = -EIO; 566 error = -EIO;
812 else { !! 567 else
813 struct gfs2_meta_heade <<
814 (struct gfs2_m <<
815 <<
816 if (mh->mh_type == cpu <<
817 obsolete_rgrp( <<
818 <<
819 mark_buffer_dirty(bh_i 568 mark_buffer_dirty(bh_ip);
820 } !! 569
821 brelse(bh_log); 570 brelse(bh_log);
822 brelse(bh_ip); 571 brelse(bh_ip);
823 572
824 if (error) 573 if (error)
825 break; 574 break;
826 575
827 jd->jd_replayed_blocks++; 576 jd->jd_replayed_blocks++;
828 } 577 }
829 578
830 return error; 579 return error;
831 } 580 }
832 581
>> 582 /**
>> 583 * gfs2_meta_sync - Sync all buffers associated with a glock
>> 584 * @gl: The glock
>> 585 *
>> 586 */
>> 587
>> 588 static void gfs2_meta_sync(struct gfs2_glock *gl)
>> 589 {
>> 590 struct address_space *mapping = gfs2_glock2aspace(gl);
>> 591 struct gfs2_sbd *sdp = gl->gl_name.ln_sbd;
>> 592 int error;
>> 593
>> 594 if (mapping == NULL)
>> 595 mapping = &sdp->sd_aspace;
>> 596
>> 597 filemap_fdatawrite(mapping);
>> 598 error = filemap_fdatawait(mapping);
>> 599
>> 600 if (error)
>> 601 gfs2_io_error(gl->gl_name.ln_sbd);
>> 602 }
>> 603
833 static void buf_lo_after_scan(struct gfs2_jdes 604 static void buf_lo_after_scan(struct gfs2_jdesc *jd, int error, int pass)
834 { 605 {
835 struct gfs2_inode *ip = GFS2_I(jd->jd_ 606 struct gfs2_inode *ip = GFS2_I(jd->jd_inode);
836 struct gfs2_sbd *sdp = GFS2_SB(jd->jd_ 607 struct gfs2_sbd *sdp = GFS2_SB(jd->jd_inode);
837 608
838 if (error) { 609 if (error) {
839 gfs2_inode_metasync(ip->i_gl); !! 610 gfs2_meta_sync(ip->i_gl);
840 return; 611 return;
841 } 612 }
842 if (pass != 1) 613 if (pass != 1)
843 return; 614 return;
844 615
845 gfs2_inode_metasync(ip->i_gl); !! 616 gfs2_meta_sync(ip->i_gl);
846 617
847 fs_info(sdp, "jid=%u: Replayed %u of % 618 fs_info(sdp, "jid=%u: Replayed %u of %u blocks\n",
848 jd->jd_jid, jd->jd_replayed_bl 619 jd->jd_jid, jd->jd_replayed_blocks, jd->jd_found_blocks);
849 } 620 }
850 621
851 static void revoke_lo_before_commit(struct gfs 622 static void revoke_lo_before_commit(struct gfs2_sbd *sdp, struct gfs2_trans *tr)
852 { 623 {
853 struct gfs2_meta_header *mh; 624 struct gfs2_meta_header *mh;
854 unsigned int offset; 625 unsigned int offset;
855 struct list_head *head = &sdp->sd_log_ !! 626 struct list_head *head = &sdp->sd_log_le_revoke;
856 struct gfs2_bufdata *bd; 627 struct gfs2_bufdata *bd;
857 struct page *page; 628 struct page *page;
858 unsigned int length; 629 unsigned int length;
859 630
860 gfs2_flush_revokes(sdp); !! 631 gfs2_write_revokes(sdp);
861 if (!sdp->sd_log_num_revoke) 632 if (!sdp->sd_log_num_revoke)
862 return; 633 return;
863 634
864 length = gfs2_struct2blk(sdp, sdp->sd_ !! 635 length = gfs2_struct2blk(sdp, sdp->sd_log_num_revoke, sizeof(u64));
865 page = gfs2_get_log_desc(sdp, GFS2_LOG 636 page = gfs2_get_log_desc(sdp, GFS2_LOG_DESC_REVOKE, length, sdp->sd_log_num_revoke);
866 offset = sizeof(struct gfs2_log_descri 637 offset = sizeof(struct gfs2_log_descriptor);
867 638
868 list_for_each_entry(bd, head, bd_list) 639 list_for_each_entry(bd, head, bd_list) {
869 sdp->sd_log_num_revoke--; 640 sdp->sd_log_num_revoke--;
870 641
871 if (offset + sizeof(u64) > sdp 642 if (offset + sizeof(u64) > sdp->sd_sb.sb_bsize) {
>> 643
872 gfs2_log_write_page(sd 644 gfs2_log_write_page(sdp, page);
873 page = mempool_alloc(g 645 page = mempool_alloc(gfs2_page_pool, GFP_NOIO);
874 mh = page_address(page 646 mh = page_address(page);
875 clear_page(mh); 647 clear_page(mh);
876 mh->mh_magic = cpu_to_ 648 mh->mh_magic = cpu_to_be32(GFS2_MAGIC);
877 mh->mh_type = cpu_to_b 649 mh->mh_type = cpu_to_be32(GFS2_METATYPE_LB);
878 mh->mh_format = cpu_to 650 mh->mh_format = cpu_to_be32(GFS2_FORMAT_LB);
879 offset = sizeof(struct 651 offset = sizeof(struct gfs2_meta_header);
880 } 652 }
881 653
882 *(__be64 *)(page_address(page) 654 *(__be64 *)(page_address(page) + offset) = cpu_to_be64(bd->bd_blkno);
883 offset += sizeof(u64); 655 offset += sizeof(u64);
884 } 656 }
885 gfs2_assert_withdraw(sdp, !sdp->sd_log 657 gfs2_assert_withdraw(sdp, !sdp->sd_log_num_revoke);
886 658
887 gfs2_log_write_page(sdp, page); 659 gfs2_log_write_page(sdp, page);
888 } 660 }
889 661
890 void gfs2_drain_revokes(struct gfs2_sbd *sdp) !! 662 static void revoke_lo_after_commit(struct gfs2_sbd *sdp, struct gfs2_trans *tr)
891 { 663 {
892 struct list_head *head = &sdp->sd_log_ !! 664 struct list_head *head = &sdp->sd_log_le_revoke;
893 struct gfs2_bufdata *bd; 665 struct gfs2_bufdata *bd;
894 struct gfs2_glock *gl; 666 struct gfs2_glock *gl;
895 667
896 while (!list_empty(head)) { 668 while (!list_empty(head)) {
897 bd = list_first_entry(head, st !! 669 bd = list_entry(head->next, struct gfs2_bufdata, bd_list);
898 list_del_init(&bd->bd_list); 670 list_del_init(&bd->bd_list);
899 gl = bd->bd_gl; 671 gl = bd->bd_gl;
900 gfs2_glock_remove_revoke(gl); !! 672 if (atomic_dec_return(&gl->gl_revokes) == 0) {
>> 673 clear_bit(GLF_LFLUSH, &gl->gl_flags);
>> 674 gfs2_glock_queue_put(gl);
>> 675 }
901 kmem_cache_free(gfs2_bufdata_c 676 kmem_cache_free(gfs2_bufdata_cachep, bd);
902 } 677 }
903 } 678 }
904 679
905 static void revoke_lo_after_commit(struct gfs2 <<
906 { <<
907 gfs2_drain_revokes(sdp); <<
908 } <<
909 <<
910 static void revoke_lo_before_scan(struct gfs2_ 680 static void revoke_lo_before_scan(struct gfs2_jdesc *jd,
911 struct gfs2_ 681 struct gfs2_log_header_host *head, int pass)
912 { 682 {
913 if (pass != 0) 683 if (pass != 0)
914 return; 684 return;
915 685
916 jd->jd_found_revokes = 0; 686 jd->jd_found_revokes = 0;
917 jd->jd_replay_tail = head->lh_tail; 687 jd->jd_replay_tail = head->lh_tail;
918 } 688 }
919 689
920 static int revoke_lo_scan_elements(struct gfs2 !! 690 static int revoke_lo_scan_elements(struct gfs2_jdesc *jd, unsigned int start,
921 struct gfs2 691 struct gfs2_log_descriptor *ld, __be64 *ptr,
922 int pass) 692 int pass)
923 { 693 {
924 struct gfs2_sbd *sdp = GFS2_SB(jd->jd_ 694 struct gfs2_sbd *sdp = GFS2_SB(jd->jd_inode);
925 unsigned int blks = be32_to_cpu(ld->ld 695 unsigned int blks = be32_to_cpu(ld->ld_length);
926 unsigned int revokes = be32_to_cpu(ld- 696 unsigned int revokes = be32_to_cpu(ld->ld_data1);
927 struct buffer_head *bh; 697 struct buffer_head *bh;
928 unsigned int offset; 698 unsigned int offset;
929 u64 blkno; 699 u64 blkno;
930 int first = 1; 700 int first = 1;
931 int error; 701 int error;
932 702
933 if (pass != 0 || be32_to_cpu(ld->ld_ty 703 if (pass != 0 || be32_to_cpu(ld->ld_type) != GFS2_LOG_DESC_REVOKE)
934 return 0; 704 return 0;
935 705
936 offset = sizeof(struct gfs2_log_descri 706 offset = sizeof(struct gfs2_log_descriptor);
937 707
938 for (; blks; gfs2_replay_incr_blk(jd, 708 for (; blks; gfs2_replay_incr_blk(jd, &start), blks--) {
939 error = gfs2_replay_read_block 709 error = gfs2_replay_read_block(jd, start, &bh);
940 if (error) 710 if (error)
941 return error; 711 return error;
942 712
943 if (!first) 713 if (!first)
944 gfs2_metatype_check(sd 714 gfs2_metatype_check(sdp, bh, GFS2_METATYPE_LB);
945 715
946 while (offset + sizeof(u64) <= 716 while (offset + sizeof(u64) <= sdp->sd_sb.sb_bsize) {
947 blkno = be64_to_cpu(*( 717 blkno = be64_to_cpu(*(__be64 *)(bh->b_data + offset));
948 718
949 error = gfs2_revoke_ad 719 error = gfs2_revoke_add(jd, blkno, start);
950 if (error < 0) { 720 if (error < 0) {
951 brelse(bh); 721 brelse(bh);
952 return error; 722 return error;
953 } 723 }
954 else if (error) 724 else if (error)
955 jd->jd_found_r 725 jd->jd_found_revokes++;
956 726
957 if (!--revokes) 727 if (!--revokes)
958 break; 728 break;
959 offset += sizeof(u64); 729 offset += sizeof(u64);
960 } 730 }
961 731
962 brelse(bh); 732 brelse(bh);
963 offset = sizeof(struct gfs2_me 733 offset = sizeof(struct gfs2_meta_header);
964 first = 0; 734 first = 0;
965 } 735 }
966 736
967 return 0; 737 return 0;
968 } 738 }
969 739
970 static void revoke_lo_after_scan(struct gfs2_j 740 static void revoke_lo_after_scan(struct gfs2_jdesc *jd, int error, int pass)
971 { 741 {
972 struct gfs2_sbd *sdp = GFS2_SB(jd->jd_ 742 struct gfs2_sbd *sdp = GFS2_SB(jd->jd_inode);
973 743
974 if (error) { 744 if (error) {
975 gfs2_revoke_clean(jd); 745 gfs2_revoke_clean(jd);
976 return; 746 return;
977 } 747 }
978 if (pass != 1) 748 if (pass != 1)
979 return; 749 return;
980 750
981 fs_info(sdp, "jid=%u: Found %u revoke 751 fs_info(sdp, "jid=%u: Found %u revoke tags\n",
982 jd->jd_jid, jd->jd_found_revok 752 jd->jd_jid, jd->jd_found_revokes);
983 753
984 gfs2_revoke_clean(jd); 754 gfs2_revoke_clean(jd);
985 } 755 }
986 756
987 /** 757 /**
988 * databuf_lo_before_commit - Scan the data bu 758 * databuf_lo_before_commit - Scan the data buffers, writing as we go
989 * @sdp: The filesystem !! 759 *
990 * @tr: The system transaction being flushed <<
991 */ 760 */
992 761
993 static void databuf_lo_before_commit(struct gf 762 static void databuf_lo_before_commit(struct gfs2_sbd *sdp, struct gfs2_trans *tr)
994 { 763 {
995 unsigned int limit = databuf_limit(sdp 764 unsigned int limit = databuf_limit(sdp);
996 unsigned int nbuf; 765 unsigned int nbuf;
997 if (tr == NULL) 766 if (tr == NULL)
998 return; 767 return;
999 nbuf = tr->tr_num_databuf_new - tr->tr 768 nbuf = tr->tr_num_databuf_new - tr->tr_num_databuf_rm;
1000 gfs2_before_commit(sdp, limit, nbuf, 769 gfs2_before_commit(sdp, limit, nbuf, &tr->tr_databuf, 1);
1001 } 770 }
1002 771
1003 static int databuf_lo_scan_elements(struct gf !! 772 static int databuf_lo_scan_elements(struct gfs2_jdesc *jd, unsigned int start,
1004 struct gf 773 struct gfs2_log_descriptor *ld,
1005 __be64 *p 774 __be64 *ptr, int pass)
1006 { 775 {
1007 struct gfs2_inode *ip = GFS2_I(jd->jd 776 struct gfs2_inode *ip = GFS2_I(jd->jd_inode);
1008 struct gfs2_glock *gl = ip->i_gl; 777 struct gfs2_glock *gl = ip->i_gl;
1009 unsigned int blks = be32_to_cpu(ld->l 778 unsigned int blks = be32_to_cpu(ld->ld_data1);
1010 struct buffer_head *bh_log, *bh_ip; 779 struct buffer_head *bh_log, *bh_ip;
1011 u64 blkno; 780 u64 blkno;
1012 u64 esc; 781 u64 esc;
1013 int error = 0; 782 int error = 0;
1014 783
1015 if (pass != 1 || be32_to_cpu(ld->ld_t 784 if (pass != 1 || be32_to_cpu(ld->ld_type) != GFS2_LOG_DESC_JDATA)
1016 return 0; 785 return 0;
1017 786
1018 gfs2_replay_incr_blk(jd, &start); 787 gfs2_replay_incr_blk(jd, &start);
1019 for (; blks; gfs2_replay_incr_blk(jd, 788 for (; blks; gfs2_replay_incr_blk(jd, &start), blks--) {
1020 blkno = be64_to_cpu(*ptr++); 789 blkno = be64_to_cpu(*ptr++);
1021 esc = be64_to_cpu(*ptr++); 790 esc = be64_to_cpu(*ptr++);
1022 791
1023 jd->jd_found_blocks++; 792 jd->jd_found_blocks++;
1024 793
1025 if (gfs2_revoke_check(jd, blk 794 if (gfs2_revoke_check(jd, blkno, start))
1026 continue; 795 continue;
1027 796
1028 error = gfs2_replay_read_bloc 797 error = gfs2_replay_read_block(jd, start, &bh_log);
1029 if (error) 798 if (error)
1030 return error; 799 return error;
1031 800
1032 bh_ip = gfs2_meta_new(gl, blk 801 bh_ip = gfs2_meta_new(gl, blkno);
1033 memcpy(bh_ip->b_data, bh_log- 802 memcpy(bh_ip->b_data, bh_log->b_data, bh_log->b_size);
1034 803
1035 /* Unescape */ 804 /* Unescape */
1036 if (esc) { 805 if (esc) {
1037 __be32 *eptr = (__be3 806 __be32 *eptr = (__be32 *)bh_ip->b_data;
1038 *eptr = cpu_to_be32(G 807 *eptr = cpu_to_be32(GFS2_MAGIC);
1039 } 808 }
1040 mark_buffer_dirty(bh_ip); 809 mark_buffer_dirty(bh_ip);
1041 810
1042 brelse(bh_log); 811 brelse(bh_log);
1043 brelse(bh_ip); 812 brelse(bh_ip);
1044 813
1045 jd->jd_replayed_blocks++; 814 jd->jd_replayed_blocks++;
1046 } 815 }
1047 816
1048 return error; 817 return error;
1049 } 818 }
1050 819
1051 /* FIXME: sort out accounting for log blocks 820 /* FIXME: sort out accounting for log blocks etc. */
1052 821
1053 static void databuf_lo_after_scan(struct gfs2 822 static void databuf_lo_after_scan(struct gfs2_jdesc *jd, int error, int pass)
1054 { 823 {
1055 struct gfs2_inode *ip = GFS2_I(jd->jd 824 struct gfs2_inode *ip = GFS2_I(jd->jd_inode);
1056 struct gfs2_sbd *sdp = GFS2_SB(jd->jd 825 struct gfs2_sbd *sdp = GFS2_SB(jd->jd_inode);
1057 826
1058 if (error) { 827 if (error) {
1059 gfs2_inode_metasync(ip->i_gl) !! 828 gfs2_meta_sync(ip->i_gl);
1060 return; 829 return;
1061 } 830 }
1062 if (pass != 1) 831 if (pass != 1)
1063 return; 832 return;
1064 833
1065 /* data sync? */ 834 /* data sync? */
1066 gfs2_inode_metasync(ip->i_gl); !! 835 gfs2_meta_sync(ip->i_gl);
1067 836
1068 fs_info(sdp, "jid=%u: Replayed %u of 837 fs_info(sdp, "jid=%u: Replayed %u of %u data blocks\n",
1069 jd->jd_jid, jd->jd_replayed_b 838 jd->jd_jid, jd->jd_replayed_blocks, jd->jd_found_blocks);
1070 } 839 }
1071 840
1072 static void databuf_lo_after_commit(struct gf 841 static void databuf_lo_after_commit(struct gfs2_sbd *sdp, struct gfs2_trans *tr)
1073 { 842 {
1074 struct list_head *head; 843 struct list_head *head;
1075 struct gfs2_bufdata *bd; 844 struct gfs2_bufdata *bd;
1076 845
1077 if (tr == NULL) 846 if (tr == NULL)
1078 return; 847 return;
1079 848
1080 head = &tr->tr_databuf; 849 head = &tr->tr_databuf;
1081 while (!list_empty(head)) { 850 while (!list_empty(head)) {
1082 bd = list_first_entry(head, s !! 851 bd = list_entry(head->next, struct gfs2_bufdata, bd_list);
1083 list_del_init(&bd->bd_list); 852 list_del_init(&bd->bd_list);
1084 gfs2_unpin(sdp, bd->bd_bh, tr 853 gfs2_unpin(sdp, bd->bd_bh, tr);
1085 } 854 }
1086 } 855 }
1087 856
1088 857
1089 static const struct gfs2_log_operations gfs2_ !! 858 const struct gfs2_log_operations gfs2_buf_lops = {
1090 .lo_before_commit = buf_lo_before_com 859 .lo_before_commit = buf_lo_before_commit,
1091 .lo_after_commit = buf_lo_after_commi 860 .lo_after_commit = buf_lo_after_commit,
1092 .lo_before_scan = buf_lo_before_scan, 861 .lo_before_scan = buf_lo_before_scan,
1093 .lo_scan_elements = buf_lo_scan_eleme 862 .lo_scan_elements = buf_lo_scan_elements,
1094 .lo_after_scan = buf_lo_after_scan, 863 .lo_after_scan = buf_lo_after_scan,
1095 .lo_name = "buf", 864 .lo_name = "buf",
1096 }; 865 };
1097 866
1098 static const struct gfs2_log_operations gfs2_ !! 867 const struct gfs2_log_operations gfs2_revoke_lops = {
1099 .lo_before_commit = revoke_lo_before_ 868 .lo_before_commit = revoke_lo_before_commit,
1100 .lo_after_commit = revoke_lo_after_co 869 .lo_after_commit = revoke_lo_after_commit,
1101 .lo_before_scan = revoke_lo_before_sc 870 .lo_before_scan = revoke_lo_before_scan,
1102 .lo_scan_elements = revoke_lo_scan_el 871 .lo_scan_elements = revoke_lo_scan_elements,
1103 .lo_after_scan = revoke_lo_after_scan 872 .lo_after_scan = revoke_lo_after_scan,
1104 .lo_name = "revoke", 873 .lo_name = "revoke",
1105 }; 874 };
1106 875
1107 static const struct gfs2_log_operations gfs2_ !! 876 const struct gfs2_log_operations gfs2_databuf_lops = {
1108 .lo_before_commit = databuf_lo_before 877 .lo_before_commit = databuf_lo_before_commit,
1109 .lo_after_commit = databuf_lo_after_c 878 .lo_after_commit = databuf_lo_after_commit,
1110 .lo_scan_elements = databuf_lo_scan_e 879 .lo_scan_elements = databuf_lo_scan_elements,
1111 .lo_after_scan = databuf_lo_after_sca 880 .lo_after_scan = databuf_lo_after_scan,
1112 .lo_name = "databuf", 881 .lo_name = "databuf",
1113 }; 882 };
1114 883
1115 const struct gfs2_log_operations *gfs2_log_op 884 const struct gfs2_log_operations *gfs2_log_ops[] = {
1116 &gfs2_databuf_lops, 885 &gfs2_databuf_lops,
1117 &gfs2_buf_lops, 886 &gfs2_buf_lops,
1118 &gfs2_revoke_lops, 887 &gfs2_revoke_lops,
1119 NULL, 888 NULL,
1120 }; 889 };
1121 890
1122 891
Linux® is a registered trademark of Linus Torvalds in the United States and other countries.
TOMOYO® is a registered trademark of NTT DATA CORPORATION.