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