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