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