1 // SPDX-License-Identifier: GPL-2.0 1 // SPDX-License-Identifier: GPL-2.0
2 /* 2 /*
3 * Copyright (c) 2000-2003,2005 Silicon Graphi 3 * Copyright (c) 2000-2003,2005 Silicon Graphics, Inc.
4 * Copyright (C) 2010 Red Hat, Inc. 4 * Copyright (C) 2010 Red Hat, Inc.
5 * All Rights Reserved. 5 * All Rights Reserved.
6 */ 6 */
7 #include "xfs.h" 7 #include "xfs.h"
8 #include "xfs_fs.h" 8 #include "xfs_fs.h"
9 #include "xfs_shared.h" 9 #include "xfs_shared.h"
10 #include "xfs_format.h" 10 #include "xfs_format.h"
11 #include "xfs_log_format.h" 11 #include "xfs_log_format.h"
>> 12 #include "xfs_log_priv.h"
12 #include "xfs_trans_resv.h" 13 #include "xfs_trans_resv.h"
13 #include "xfs_mount.h" 14 #include "xfs_mount.h"
14 #include "xfs_extent_busy.h" 15 #include "xfs_extent_busy.h"
15 #include "xfs_quota.h" 16 #include "xfs_quota.h"
16 #include "xfs_trans.h" 17 #include "xfs_trans.h"
17 #include "xfs_trans_priv.h" 18 #include "xfs_trans_priv.h"
18 #include "xfs_log.h" 19 #include "xfs_log.h"
19 #include "xfs_log_priv.h" <<
20 #include "xfs_trace.h" 20 #include "xfs_trace.h"
21 #include "xfs_error.h" 21 #include "xfs_error.h"
22 #include "xfs_defer.h" 22 #include "xfs_defer.h"
23 #include "xfs_inode.h" 23 #include "xfs_inode.h"
24 #include "xfs_dquot_item.h" 24 #include "xfs_dquot_item.h"
25 #include "xfs_dquot.h" 25 #include "xfs_dquot.h"
26 #include "xfs_icache.h" 26 #include "xfs_icache.h"
27 #include "xfs_rtbitmap.h" <<
28 27
29 struct kmem_cache *xfs_trans_cache; !! 28 kmem_zone_t *xfs_trans_zone;
30 29
31 #if defined(CONFIG_TRACEPOINTS) 30 #if defined(CONFIG_TRACEPOINTS)
32 static void 31 static void
33 xfs_trans_trace_reservations( 32 xfs_trans_trace_reservations(
34 struct xfs_mount *mp) 33 struct xfs_mount *mp)
35 { 34 {
>> 35 struct xfs_trans_res resv;
36 struct xfs_trans_res *res; 36 struct xfs_trans_res *res;
37 struct xfs_trans_res *end_res; 37 struct xfs_trans_res *end_res;
38 int i; 38 int i;
39 39
40 res = (struct xfs_trans_res *)M_RES(mp 40 res = (struct xfs_trans_res *)M_RES(mp);
41 end_res = (struct xfs_trans_res *)(M_R 41 end_res = (struct xfs_trans_res *)(M_RES(mp) + 1);
42 for (i = 0; res < end_res; i++, res++) 42 for (i = 0; res < end_res; i++, res++)
43 trace_xfs_trans_resv_calc(mp, 43 trace_xfs_trans_resv_calc(mp, i, res);
>> 44 xfs_log_get_max_trans_res(mp, &resv);
>> 45 trace_xfs_trans_resv_calc(mp, -1, &resv);
44 } 46 }
45 #else 47 #else
46 # define xfs_trans_trace_reservations(mp) 48 # define xfs_trans_trace_reservations(mp)
47 #endif 49 #endif
48 50
49 /* 51 /*
50 * Initialize the precomputed transaction rese 52 * Initialize the precomputed transaction reservation values
51 * in the mount structure. 53 * in the mount structure.
52 */ 54 */
53 void 55 void
54 xfs_trans_init( 56 xfs_trans_init(
55 struct xfs_mount *mp) 57 struct xfs_mount *mp)
56 { 58 {
57 xfs_trans_resv_calc(mp, M_RES(mp)); 59 xfs_trans_resv_calc(mp, M_RES(mp));
58 xfs_trans_trace_reservations(mp); 60 xfs_trans_trace_reservations(mp);
59 } 61 }
60 62
61 /* 63 /*
62 * Free the transaction structure. If there i 64 * Free the transaction structure. If there is more clean up
63 * to do when the structure is freed, add it h 65 * to do when the structure is freed, add it here.
64 */ 66 */
65 STATIC void 67 STATIC void
66 xfs_trans_free( 68 xfs_trans_free(
67 struct xfs_trans *tp) 69 struct xfs_trans *tp)
68 { 70 {
69 xfs_extent_busy_sort(&tp->t_busy); 71 xfs_extent_busy_sort(&tp->t_busy);
70 xfs_extent_busy_clear(tp->t_mountp, &t 72 xfs_extent_busy_clear(tp->t_mountp, &tp->t_busy, false);
71 73
72 trace_xfs_trans_free(tp, _RET_IP_); 74 trace_xfs_trans_free(tp, _RET_IP_);
73 xfs_trans_clear_context(tp); 75 xfs_trans_clear_context(tp);
74 if (!(tp->t_flags & XFS_TRANS_NO_WRITE 76 if (!(tp->t_flags & XFS_TRANS_NO_WRITECOUNT))
75 sb_end_intwrite(tp->t_mountp-> 77 sb_end_intwrite(tp->t_mountp->m_super);
76 xfs_trans_free_dqinfo(tp); 78 xfs_trans_free_dqinfo(tp);
77 kmem_cache_free(xfs_trans_cache, tp); !! 79 kmem_cache_free(xfs_trans_zone, tp);
78 } 80 }
79 81
80 /* 82 /*
81 * This is called to create a new transaction 83 * This is called to create a new transaction which will share the
82 * permanent log reservation of the given tran 84 * permanent log reservation of the given transaction. The remaining
83 * unused block and rt extent reservations are 85 * unused block and rt extent reservations are also inherited. This
84 * implies that the original transaction is no 86 * implies that the original transaction is no longer allowed to allocate
85 * blocks. Locks and log items, however, are 87 * blocks. Locks and log items, however, are no inherited. They must
86 * be added to the new transaction explicitly. 88 * be added to the new transaction explicitly.
87 */ 89 */
88 STATIC struct xfs_trans * 90 STATIC struct xfs_trans *
89 xfs_trans_dup( 91 xfs_trans_dup(
90 struct xfs_trans *tp) 92 struct xfs_trans *tp)
91 { 93 {
92 struct xfs_trans *ntp; 94 struct xfs_trans *ntp;
93 95
94 trace_xfs_trans_dup(tp, _RET_IP_); 96 trace_xfs_trans_dup(tp, _RET_IP_);
95 97
96 ntp = kmem_cache_zalloc(xfs_trans_cach !! 98 ntp = kmem_cache_zalloc(xfs_trans_zone, GFP_KERNEL | __GFP_NOFAIL);
97 99
98 /* 100 /*
99 * Initialize the new transaction stru 101 * Initialize the new transaction structure.
100 */ 102 */
101 ntp->t_magic = XFS_TRANS_HEADER_MAGIC; 103 ntp->t_magic = XFS_TRANS_HEADER_MAGIC;
102 ntp->t_mountp = tp->t_mountp; 104 ntp->t_mountp = tp->t_mountp;
103 INIT_LIST_HEAD(&ntp->t_items); 105 INIT_LIST_HEAD(&ntp->t_items);
104 INIT_LIST_HEAD(&ntp->t_busy); 106 INIT_LIST_HEAD(&ntp->t_busy);
105 INIT_LIST_HEAD(&ntp->t_dfops); 107 INIT_LIST_HEAD(&ntp->t_dfops);
106 ntp->t_highest_agno = NULLAGNUMBER; !! 108 ntp->t_firstblock = NULLFSBLOCK;
107 109
108 ASSERT(tp->t_flags & XFS_TRANS_PERM_LO 110 ASSERT(tp->t_flags & XFS_TRANS_PERM_LOG_RES);
109 ASSERT(tp->t_ticket != NULL); 111 ASSERT(tp->t_ticket != NULL);
110 112
111 ntp->t_flags = XFS_TRANS_PERM_LOG_RES 113 ntp->t_flags = XFS_TRANS_PERM_LOG_RES |
112 (tp->t_flags & XFS_TRAN 114 (tp->t_flags & XFS_TRANS_RESERVE) |
113 (tp->t_flags & XFS_TRAN 115 (tp->t_flags & XFS_TRANS_NO_WRITECOUNT) |
114 (tp->t_flags & XFS_TRAN 116 (tp->t_flags & XFS_TRANS_RES_FDBLKS);
115 /* We gave our writer reference to the 117 /* We gave our writer reference to the new transaction */
116 tp->t_flags |= XFS_TRANS_NO_WRITECOUNT 118 tp->t_flags |= XFS_TRANS_NO_WRITECOUNT;
117 ntp->t_ticket = xfs_log_ticket_get(tp- 119 ntp->t_ticket = xfs_log_ticket_get(tp->t_ticket);
118 120
119 ASSERT(tp->t_blk_res >= tp->t_blk_res_ 121 ASSERT(tp->t_blk_res >= tp->t_blk_res_used);
120 ntp->t_blk_res = tp->t_blk_res - tp->t 122 ntp->t_blk_res = tp->t_blk_res - tp->t_blk_res_used;
121 tp->t_blk_res = tp->t_blk_res_used; 123 tp->t_blk_res = tp->t_blk_res_used;
122 124
123 ntp->t_rtx_res = tp->t_rtx_res - tp->t 125 ntp->t_rtx_res = tp->t_rtx_res - tp->t_rtx_res_used;
124 tp->t_rtx_res = tp->t_rtx_res_used; 126 tp->t_rtx_res = tp->t_rtx_res_used;
125 127
126 xfs_trans_switch_context(tp, ntp); 128 xfs_trans_switch_context(tp, ntp);
127 129
128 /* move deferred ops over to the new t 130 /* move deferred ops over to the new tp */
129 xfs_defer_move(ntp, tp); 131 xfs_defer_move(ntp, tp);
130 132
131 xfs_trans_dup_dqinfo(tp, ntp); 133 xfs_trans_dup_dqinfo(tp, ntp);
132 return ntp; 134 return ntp;
133 } 135 }
134 136
135 /* 137 /*
136 * This is called to reserve free disk blocks 138 * This is called to reserve free disk blocks and log space for the
137 * given transaction. This must be done befor 139 * given transaction. This must be done before allocating any resources
138 * within the transaction. 140 * within the transaction.
139 * 141 *
140 * This will return ENOSPC if there are not en 142 * This will return ENOSPC if there are not enough blocks available.
141 * It will sleep waiting for available log spa 143 * It will sleep waiting for available log space.
142 * The only valid value for the flags paramete 144 * The only valid value for the flags parameter is XFS_RES_LOG_PERM, which
143 * is used by long running transactions. If a 145 * is used by long running transactions. If any one of the reservations
144 * fails then they will all be backed out. 146 * fails then they will all be backed out.
145 * 147 *
146 * This does not do quota reservations. That t 148 * This does not do quota reservations. That typically is done by the
147 * caller afterwards. 149 * caller afterwards.
148 */ 150 */
149 static int 151 static int
150 xfs_trans_reserve( 152 xfs_trans_reserve(
151 struct xfs_trans *tp, 153 struct xfs_trans *tp,
152 struct xfs_trans_res *resp, 154 struct xfs_trans_res *resp,
153 uint blocks, 155 uint blocks,
154 uint rtextents) 156 uint rtextents)
155 { 157 {
156 struct xfs_mount *mp = tp->t_mo 158 struct xfs_mount *mp = tp->t_mountp;
157 int error = 0; 159 int error = 0;
158 bool rsvd = (tp->t_ 160 bool rsvd = (tp->t_flags & XFS_TRANS_RESERVE) != 0;
159 161
160 /* 162 /*
161 * Attempt to reserve the needed disk 163 * Attempt to reserve the needed disk blocks by decrementing
162 * the number needed from the number a 164 * the number needed from the number available. This will
163 * fail if the count would go below ze 165 * fail if the count would go below zero.
164 */ 166 */
165 if (blocks > 0) { 167 if (blocks > 0) {
166 error = xfs_dec_fdblocks(mp, b !! 168 error = xfs_mod_fdblocks(mp, -((int64_t)blocks), rsvd);
167 if (error != 0) 169 if (error != 0)
168 return -ENOSPC; 170 return -ENOSPC;
169 tp->t_blk_res += blocks; 171 tp->t_blk_res += blocks;
170 } 172 }
171 173
172 /* 174 /*
173 * Reserve the log space needed for th 175 * Reserve the log space needed for this transaction.
174 */ 176 */
175 if (resp->tr_logres > 0) { 177 if (resp->tr_logres > 0) {
176 bool permanent = false; 178 bool permanent = false;
177 179
178 ASSERT(tp->t_log_res == 0 || 180 ASSERT(tp->t_log_res == 0 ||
179 tp->t_log_res == resp-> 181 tp->t_log_res == resp->tr_logres);
180 ASSERT(tp->t_log_count == 0 || 182 ASSERT(tp->t_log_count == 0 ||
181 tp->t_log_count == resp 183 tp->t_log_count == resp->tr_logcount);
182 184
183 if (resp->tr_logflags & XFS_TR 185 if (resp->tr_logflags & XFS_TRANS_PERM_LOG_RES) {
184 tp->t_flags |= XFS_TRA 186 tp->t_flags |= XFS_TRANS_PERM_LOG_RES;
185 permanent = true; 187 permanent = true;
186 } else { 188 } else {
187 ASSERT(tp->t_ticket == 189 ASSERT(tp->t_ticket == NULL);
188 ASSERT(!(tp->t_flags & 190 ASSERT(!(tp->t_flags & XFS_TRANS_PERM_LOG_RES));
189 } 191 }
190 192
191 if (tp->t_ticket != NULL) { 193 if (tp->t_ticket != NULL) {
192 ASSERT(resp->tr_logfla 194 ASSERT(resp->tr_logflags & XFS_TRANS_PERM_LOG_RES);
193 error = xfs_log_regran 195 error = xfs_log_regrant(mp, tp->t_ticket);
194 } else { 196 } else {
195 error = xfs_log_reserv !! 197 error = xfs_log_reserve(mp,
>> 198 resp->tr_logres,
196 199 resp->tr_logcount,
197 !! 200 &tp->t_ticket, XFS_TRANSACTION,
>> 201 permanent);
198 } 202 }
199 203
200 if (error) 204 if (error)
201 goto undo_blocks; 205 goto undo_blocks;
202 206
203 tp->t_log_res = resp->tr_logre 207 tp->t_log_res = resp->tr_logres;
204 tp->t_log_count = resp->tr_log 208 tp->t_log_count = resp->tr_logcount;
205 } 209 }
206 210
207 /* 211 /*
208 * Attempt to reserve the needed realt 212 * Attempt to reserve the needed realtime extents by decrementing
209 * the number needed from the number a 213 * the number needed from the number available. This will
210 * fail if the count would go below ze 214 * fail if the count would go below zero.
211 */ 215 */
212 if (rtextents > 0) { 216 if (rtextents > 0) {
213 error = xfs_dec_frextents(mp, !! 217 error = xfs_mod_frextents(mp, -((int64_t)rtextents));
214 if (error) { 218 if (error) {
215 error = -ENOSPC; 219 error = -ENOSPC;
216 goto undo_log; 220 goto undo_log;
217 } 221 }
218 tp->t_rtx_res += rtextents; 222 tp->t_rtx_res += rtextents;
219 } 223 }
220 224
221 return 0; 225 return 0;
222 226
223 /* 227 /*
224 * Error cases jump to one of these la 228 * Error cases jump to one of these labels to undo any
225 * reservations which have already bee 229 * reservations which have already been performed.
226 */ 230 */
227 undo_log: 231 undo_log:
228 if (resp->tr_logres > 0) { 232 if (resp->tr_logres > 0) {
229 xfs_log_ticket_ungrant(mp->m_l 233 xfs_log_ticket_ungrant(mp->m_log, tp->t_ticket);
230 tp->t_ticket = NULL; 234 tp->t_ticket = NULL;
231 tp->t_log_res = 0; 235 tp->t_log_res = 0;
232 tp->t_flags &= ~XFS_TRANS_PERM 236 tp->t_flags &= ~XFS_TRANS_PERM_LOG_RES;
233 } 237 }
234 238
235 undo_blocks: 239 undo_blocks:
236 if (blocks > 0) { 240 if (blocks > 0) {
237 xfs_add_fdblocks(mp, blocks); !! 241 xfs_mod_fdblocks(mp, (int64_t)blocks, rsvd);
238 tp->t_blk_res = 0; 242 tp->t_blk_res = 0;
239 } 243 }
240 return error; 244 return error;
241 } 245 }
242 246
243 int 247 int
244 xfs_trans_alloc( 248 xfs_trans_alloc(
245 struct xfs_mount *mp, 249 struct xfs_mount *mp,
246 struct xfs_trans_res *resp, 250 struct xfs_trans_res *resp,
247 uint blocks, 251 uint blocks,
248 uint rtextents, 252 uint rtextents,
249 uint flags, 253 uint flags,
250 struct xfs_trans **tpp) 254 struct xfs_trans **tpp)
251 { 255 {
252 struct xfs_trans *tp; 256 struct xfs_trans *tp;
253 bool want_retry = t 257 bool want_retry = true;
254 int error; 258 int error;
255 259
256 /* 260 /*
257 * Allocate the handle before we do ou 261 * Allocate the handle before we do our freeze accounting and setting up
258 * GFP_NOFS allocation context so that 262 * GFP_NOFS allocation context so that we avoid lockdep false positives
259 * by doing GFP_KERNEL allocations ins 263 * by doing GFP_KERNEL allocations inside sb_start_intwrite().
260 */ 264 */
261 retry: 265 retry:
262 tp = kmem_cache_zalloc(xfs_trans_cache !! 266 tp = kmem_cache_zalloc(xfs_trans_zone, GFP_KERNEL | __GFP_NOFAIL);
263 if (!(flags & XFS_TRANS_NO_WRITECOUNT) 267 if (!(flags & XFS_TRANS_NO_WRITECOUNT))
264 sb_start_intwrite(mp->m_super) 268 sb_start_intwrite(mp->m_super);
265 xfs_trans_set_context(tp); 269 xfs_trans_set_context(tp);
266 270
267 /* 271 /*
268 * Zero-reservation ("empty") transact 272 * Zero-reservation ("empty") transactions can't modify anything, so
269 * they're allowed to run while we're 273 * they're allowed to run while we're frozen.
270 */ 274 */
271 WARN_ON(resp->tr_logres > 0 && 275 WARN_ON(resp->tr_logres > 0 &&
272 mp->m_super->s_writers.frozen 276 mp->m_super->s_writers.frozen == SB_FREEZE_COMPLETE);
273 ASSERT(!(flags & XFS_TRANS_RES_FDBLKS) 277 ASSERT(!(flags & XFS_TRANS_RES_FDBLKS) ||
274 xfs_has_lazysbcount(mp)); !! 278 xfs_sb_version_haslazysbcount(&mp->m_sb));
275 279
276 tp->t_magic = XFS_TRANS_HEADER_MAGIC; 280 tp->t_magic = XFS_TRANS_HEADER_MAGIC;
277 tp->t_flags = flags; 281 tp->t_flags = flags;
278 tp->t_mountp = mp; 282 tp->t_mountp = mp;
279 INIT_LIST_HEAD(&tp->t_items); 283 INIT_LIST_HEAD(&tp->t_items);
280 INIT_LIST_HEAD(&tp->t_busy); 284 INIT_LIST_HEAD(&tp->t_busy);
281 INIT_LIST_HEAD(&tp->t_dfops); 285 INIT_LIST_HEAD(&tp->t_dfops);
282 tp->t_highest_agno = NULLAGNUMBER; !! 286 tp->t_firstblock = NULLFSBLOCK;
283 287
284 error = xfs_trans_reserve(tp, resp, bl 288 error = xfs_trans_reserve(tp, resp, blocks, rtextents);
285 if (error == -ENOSPC && want_retry) { 289 if (error == -ENOSPC && want_retry) {
286 xfs_trans_cancel(tp); 290 xfs_trans_cancel(tp);
287 291
288 /* 292 /*
289 * We weren't able to reserve 293 * We weren't able to reserve enough space for the transaction.
290 * Flush the other speculative 294 * Flush the other speculative space allocations to free space.
291 * Do not perform a synchronou 295 * Do not perform a synchronous scan because callers can hold
292 * other locks. 296 * other locks.
293 */ 297 */
294 error = xfs_blockgc_flush_all( !! 298 error = xfs_blockgc_free_space(mp, NULL);
295 if (error) 299 if (error)
296 return error; 300 return error;
>> 301
297 want_retry = false; 302 want_retry = false;
298 goto retry; 303 goto retry;
299 } 304 }
300 if (error) { 305 if (error) {
301 xfs_trans_cancel(tp); 306 xfs_trans_cancel(tp);
302 return error; 307 return error;
303 } 308 }
304 309
305 trace_xfs_trans_alloc(tp, _RET_IP_); 310 trace_xfs_trans_alloc(tp, _RET_IP_);
306 311
307 *tpp = tp; 312 *tpp = tp;
308 return 0; 313 return 0;
309 } 314 }
310 315
311 /* 316 /*
312 * Create an empty transaction with no reserva 317 * Create an empty transaction with no reservation. This is a defensive
313 * mechanism for routines that query metadata 318 * mechanism for routines that query metadata without actually modifying them --
314 * if the metadata being queried is somehow cr 319 * if the metadata being queried is somehow cross-linked (think a btree block
315 * pointer that points higher in the tree), we 320 * pointer that points higher in the tree), we risk deadlock. However, blocks
316 * grabbed as part of a transaction can be re- 321 * grabbed as part of a transaction can be re-grabbed. The verifiers will
317 * notice the corrupt block and the operation 322 * notice the corrupt block and the operation will fail back to userspace
318 * without deadlocking. 323 * without deadlocking.
319 * 324 *
320 * Note the zero-length reservation; this tran 325 * Note the zero-length reservation; this transaction MUST be cancelled without
321 * any dirty data. 326 * any dirty data.
322 * 327 *
323 * Callers should obtain freeze protection to 328 * Callers should obtain freeze protection to avoid a conflict with fs freezing
324 * where we can be grabbing buffers at the sam 329 * where we can be grabbing buffers at the same time that freeze is trying to
325 * drain the buffer LRU list. 330 * drain the buffer LRU list.
326 */ 331 */
327 int 332 int
328 xfs_trans_alloc_empty( 333 xfs_trans_alloc_empty(
329 struct xfs_mount *mp, 334 struct xfs_mount *mp,
330 struct xfs_trans **tpp) 335 struct xfs_trans **tpp)
331 { 336 {
332 struct xfs_trans_res resv = 337 struct xfs_trans_res resv = {0};
333 338
334 return xfs_trans_alloc(mp, &resv, 0, 0 339 return xfs_trans_alloc(mp, &resv, 0, 0, XFS_TRANS_NO_WRITECOUNT, tpp);
335 } 340 }
336 341
337 /* 342 /*
338 * Record the indicated change to the given fi 343 * Record the indicated change to the given field for application
339 * to the file system's superblock when the tr 344 * to the file system's superblock when the transaction commits.
340 * For now, just store the change in the trans 345 * For now, just store the change in the transaction structure.
341 * 346 *
342 * Mark the transaction structure to indicate 347 * Mark the transaction structure to indicate that the superblock
343 * needs to be updated before committing. 348 * needs to be updated before committing.
344 * 349 *
345 * Because we may not be keeping track of allo 350 * Because we may not be keeping track of allocated/free inodes and
346 * used filesystem blocks in the superblock, w 351 * used filesystem blocks in the superblock, we do not mark the
347 * superblock dirty in this transaction if we 352 * superblock dirty in this transaction if we modify these fields.
348 * We still need to update the transaction del 353 * We still need to update the transaction deltas so that they get
349 * applied to the incore superblock, but we do 354 * applied to the incore superblock, but we don't want them to
350 * cause the superblock to get locked and logg 355 * cause the superblock to get locked and logged if these are the
351 * only fields in the superblock that the tran 356 * only fields in the superblock that the transaction modifies.
352 */ 357 */
353 void 358 void
354 xfs_trans_mod_sb( 359 xfs_trans_mod_sb(
355 xfs_trans_t *tp, 360 xfs_trans_t *tp,
356 uint field, 361 uint field,
357 int64_t delta) 362 int64_t delta)
358 { 363 {
359 uint32_t flags = (XFS_TRANS_DIR 364 uint32_t flags = (XFS_TRANS_DIRTY|XFS_TRANS_SB_DIRTY);
360 xfs_mount_t *mp = tp->t_mountp; 365 xfs_mount_t *mp = tp->t_mountp;
361 366
362 switch (field) { 367 switch (field) {
363 case XFS_TRANS_SB_ICOUNT: 368 case XFS_TRANS_SB_ICOUNT:
364 tp->t_icount_delta += delta; 369 tp->t_icount_delta += delta;
365 if (xfs_has_lazysbcount(mp)) !! 370 if (xfs_sb_version_haslazysbcount(&mp->m_sb))
366 flags &= ~XFS_TRANS_SB 371 flags &= ~XFS_TRANS_SB_DIRTY;
367 break; 372 break;
368 case XFS_TRANS_SB_IFREE: 373 case XFS_TRANS_SB_IFREE:
369 tp->t_ifree_delta += delta; 374 tp->t_ifree_delta += delta;
370 if (xfs_has_lazysbcount(mp)) !! 375 if (xfs_sb_version_haslazysbcount(&mp->m_sb))
371 flags &= ~XFS_TRANS_SB 376 flags &= ~XFS_TRANS_SB_DIRTY;
372 break; 377 break;
373 case XFS_TRANS_SB_FDBLOCKS: 378 case XFS_TRANS_SB_FDBLOCKS:
374 /* 379 /*
375 * Track the number of blocks 380 * Track the number of blocks allocated in the transaction.
376 * Make sure it does not excee 381 * Make sure it does not exceed the number reserved. If so,
377 * shutdown as this can lead t 382 * shutdown as this can lead to accounting inconsistency.
378 */ 383 */
379 if (delta < 0) { 384 if (delta < 0) {
380 tp->t_blk_res_used += 385 tp->t_blk_res_used += (uint)-delta;
381 if (tp->t_blk_res_used 386 if (tp->t_blk_res_used > tp->t_blk_res)
382 xfs_force_shut 387 xfs_force_shutdown(mp, SHUTDOWN_CORRUPT_INCORE);
383 } else if (delta > 0 && (tp->t 388 } else if (delta > 0 && (tp->t_flags & XFS_TRANS_RES_FDBLKS)) {
384 int64_t blkres_delta; 389 int64_t blkres_delta;
385 390
386 /* 391 /*
387 * Return freed blocks 392 * Return freed blocks directly to the reservation
388 * instead of the glob 393 * instead of the global pool, being careful not to
389 * overflow the trans 394 * overflow the trans counter. This is used to preserve
390 * reservation across 395 * reservation across chains of transaction rolls that
391 * repeatedly free and 396 * repeatedly free and allocate blocks.
392 */ 397 */
393 blkres_delta = min_t(i 398 blkres_delta = min_t(int64_t, delta,
394 U 399 UINT_MAX - tp->t_blk_res);
395 tp->t_blk_res += blkre 400 tp->t_blk_res += blkres_delta;
396 delta -= blkres_delta; 401 delta -= blkres_delta;
397 } 402 }
398 tp->t_fdblocks_delta += delta; 403 tp->t_fdblocks_delta += delta;
399 if (xfs_has_lazysbcount(mp)) !! 404 if (xfs_sb_version_haslazysbcount(&mp->m_sb))
400 flags &= ~XFS_TRANS_SB 405 flags &= ~XFS_TRANS_SB_DIRTY;
401 break; 406 break;
402 case XFS_TRANS_SB_RES_FDBLOCKS: 407 case XFS_TRANS_SB_RES_FDBLOCKS:
403 /* 408 /*
404 * The allocation has already 409 * The allocation has already been applied to the
405 * in-core superblock's counte 410 * in-core superblock's counter. This should only
406 * be applied to the on-disk s 411 * be applied to the on-disk superblock.
407 */ 412 */
408 tp->t_res_fdblocks_delta += de 413 tp->t_res_fdblocks_delta += delta;
409 if (xfs_has_lazysbcount(mp)) !! 414 if (xfs_sb_version_haslazysbcount(&mp->m_sb))
410 flags &= ~XFS_TRANS_SB 415 flags &= ~XFS_TRANS_SB_DIRTY;
411 break; 416 break;
412 case XFS_TRANS_SB_FREXTENTS: 417 case XFS_TRANS_SB_FREXTENTS:
413 /* 418 /*
414 * Track the number of blocks 419 * Track the number of blocks allocated in the
415 * transaction. Make sure it 420 * transaction. Make sure it does not exceed the
416 * number reserved. 421 * number reserved.
417 */ 422 */
418 if (delta < 0) { 423 if (delta < 0) {
419 tp->t_rtx_res_used += 424 tp->t_rtx_res_used += (uint)-delta;
420 ASSERT(tp->t_rtx_res_u 425 ASSERT(tp->t_rtx_res_used <= tp->t_rtx_res);
421 } 426 }
422 tp->t_frextents_delta += delta 427 tp->t_frextents_delta += delta;
423 break; 428 break;
424 case XFS_TRANS_SB_RES_FREXTENTS: 429 case XFS_TRANS_SB_RES_FREXTENTS:
425 /* 430 /*
426 * The allocation has already 431 * The allocation has already been applied to the
427 * in-core superblock's counte 432 * in-core superblock's counter. This should only
428 * be applied to the on-disk s 433 * be applied to the on-disk superblock.
429 */ 434 */
430 ASSERT(delta < 0); 435 ASSERT(delta < 0);
431 tp->t_res_frextents_delta += d 436 tp->t_res_frextents_delta += delta;
432 break; 437 break;
433 case XFS_TRANS_SB_DBLOCKS: 438 case XFS_TRANS_SB_DBLOCKS:
434 tp->t_dblocks_delta += delta; 439 tp->t_dblocks_delta += delta;
435 break; 440 break;
436 case XFS_TRANS_SB_AGCOUNT: 441 case XFS_TRANS_SB_AGCOUNT:
437 ASSERT(delta > 0); 442 ASSERT(delta > 0);
438 tp->t_agcount_delta += delta; 443 tp->t_agcount_delta += delta;
439 break; 444 break;
440 case XFS_TRANS_SB_IMAXPCT: 445 case XFS_TRANS_SB_IMAXPCT:
441 tp->t_imaxpct_delta += delta; 446 tp->t_imaxpct_delta += delta;
442 break; 447 break;
443 case XFS_TRANS_SB_REXTSIZE: 448 case XFS_TRANS_SB_REXTSIZE:
444 tp->t_rextsize_delta += delta; 449 tp->t_rextsize_delta += delta;
445 break; 450 break;
446 case XFS_TRANS_SB_RBMBLOCKS: 451 case XFS_TRANS_SB_RBMBLOCKS:
447 tp->t_rbmblocks_delta += delta 452 tp->t_rbmblocks_delta += delta;
448 break; 453 break;
449 case XFS_TRANS_SB_RBLOCKS: 454 case XFS_TRANS_SB_RBLOCKS:
450 tp->t_rblocks_delta += delta; 455 tp->t_rblocks_delta += delta;
451 break; 456 break;
452 case XFS_TRANS_SB_REXTENTS: 457 case XFS_TRANS_SB_REXTENTS:
453 tp->t_rextents_delta += delta; 458 tp->t_rextents_delta += delta;
454 break; 459 break;
455 case XFS_TRANS_SB_REXTSLOG: 460 case XFS_TRANS_SB_REXTSLOG:
456 tp->t_rextslog_delta += delta; 461 tp->t_rextslog_delta += delta;
457 break; 462 break;
458 default: 463 default:
459 ASSERT(0); 464 ASSERT(0);
460 return; 465 return;
461 } 466 }
462 467
463 tp->t_flags |= flags; 468 tp->t_flags |= flags;
464 } 469 }
465 470
466 /* 471 /*
467 * xfs_trans_apply_sb_deltas() is called from 472 * xfs_trans_apply_sb_deltas() is called from the commit code
468 * to bring the superblock buffer into the cur 473 * to bring the superblock buffer into the current transaction
469 * and modify it as requested by earlier calls 474 * and modify it as requested by earlier calls to xfs_trans_mod_sb().
470 * 475 *
471 * For now we just look at each field allowed 476 * For now we just look at each field allowed to change and change
472 * it if necessary. 477 * it if necessary.
473 */ 478 */
474 STATIC void 479 STATIC void
475 xfs_trans_apply_sb_deltas( 480 xfs_trans_apply_sb_deltas(
476 xfs_trans_t *tp) 481 xfs_trans_t *tp)
477 { 482 {
478 struct xfs_dsb *sbp; !! 483 xfs_dsb_t *sbp;
479 struct xfs_buf *bp; 484 struct xfs_buf *bp;
480 int whole = 0; 485 int whole = 0;
481 486
482 bp = xfs_trans_getsb(tp); 487 bp = xfs_trans_getsb(tp);
483 sbp = bp->b_addr; 488 sbp = bp->b_addr;
484 489
485 /* 490 /*
486 * Only update the superblock counters 491 * Only update the superblock counters if we are logging them
487 */ 492 */
488 if (!xfs_has_lazysbcount((tp->t_mountp !! 493 if (!xfs_sb_version_haslazysbcount(&(tp->t_mountp->m_sb))) {
489 if (tp->t_icount_delta) 494 if (tp->t_icount_delta)
490 be64_add_cpu(&sbp->sb_ 495 be64_add_cpu(&sbp->sb_icount, tp->t_icount_delta);
491 if (tp->t_ifree_delta) 496 if (tp->t_ifree_delta)
492 be64_add_cpu(&sbp->sb_ 497 be64_add_cpu(&sbp->sb_ifree, tp->t_ifree_delta);
493 if (tp->t_fdblocks_delta) 498 if (tp->t_fdblocks_delta)
494 be64_add_cpu(&sbp->sb_ 499 be64_add_cpu(&sbp->sb_fdblocks, tp->t_fdblocks_delta);
495 if (tp->t_res_fdblocks_delta) 500 if (tp->t_res_fdblocks_delta)
496 be64_add_cpu(&sbp->sb_ 501 be64_add_cpu(&sbp->sb_fdblocks, tp->t_res_fdblocks_delta);
497 } 502 }
498 503
499 /* !! 504 if (tp->t_frextents_delta)
500 * Updating frextents requires careful !! 505 be64_add_cpu(&sbp->sb_frextents, tp->t_frextents_delta);
501 * behave like the lazysb counters bec !! 506 if (tp->t_res_frextents_delta)
502 * recovery in older kenels to recompu !! 507 be64_add_cpu(&sbp->sb_frextents, tp->t_res_frextents_delta);
503 * This means that the ondisk frextent <<
504 * rtbitmap. <<
505 * <<
506 * Therefore, log the frextents change <<
507 * update the incore superblock so tha <<
508 * write the correct value ondisk. <<
509 * <<
510 * Don't touch m_frextents because it <<
511 * and those are handled by the unrese <<
512 */ <<
513 if (tp->t_frextents_delta || tp->t_res <<
514 struct xfs_mount *mp = <<
515 int64_t rtxdel <<
516 <<
517 rtxdelta = tp->t_frextents_del <<
518 <<
519 spin_lock(&mp->m_sb_lock); <<
520 be64_add_cpu(&sbp->sb_frextent <<
521 mp->m_sb.sb_frextents += rtxde <<
522 spin_unlock(&mp->m_sb_lock); <<
523 } <<
524 508
525 if (tp->t_dblocks_delta) { 509 if (tp->t_dblocks_delta) {
526 be64_add_cpu(&sbp->sb_dblocks, 510 be64_add_cpu(&sbp->sb_dblocks, tp->t_dblocks_delta);
527 whole = 1; 511 whole = 1;
528 } 512 }
529 if (tp->t_agcount_delta) { 513 if (tp->t_agcount_delta) {
530 be32_add_cpu(&sbp->sb_agcount, 514 be32_add_cpu(&sbp->sb_agcount, tp->t_agcount_delta);
531 whole = 1; 515 whole = 1;
532 } 516 }
533 if (tp->t_imaxpct_delta) { 517 if (tp->t_imaxpct_delta) {
534 sbp->sb_imax_pct += tp->t_imax 518 sbp->sb_imax_pct += tp->t_imaxpct_delta;
535 whole = 1; 519 whole = 1;
536 } 520 }
537 if (tp->t_rextsize_delta) { 521 if (tp->t_rextsize_delta) {
538 be32_add_cpu(&sbp->sb_rextsize 522 be32_add_cpu(&sbp->sb_rextsize, tp->t_rextsize_delta);
539 whole = 1; 523 whole = 1;
540 } 524 }
541 if (tp->t_rbmblocks_delta) { 525 if (tp->t_rbmblocks_delta) {
542 be32_add_cpu(&sbp->sb_rbmblock 526 be32_add_cpu(&sbp->sb_rbmblocks, tp->t_rbmblocks_delta);
543 whole = 1; 527 whole = 1;
544 } 528 }
545 if (tp->t_rblocks_delta) { 529 if (tp->t_rblocks_delta) {
546 be64_add_cpu(&sbp->sb_rblocks, 530 be64_add_cpu(&sbp->sb_rblocks, tp->t_rblocks_delta);
547 whole = 1; 531 whole = 1;
548 } 532 }
549 if (tp->t_rextents_delta) { 533 if (tp->t_rextents_delta) {
550 be64_add_cpu(&sbp->sb_rextents 534 be64_add_cpu(&sbp->sb_rextents, tp->t_rextents_delta);
551 whole = 1; 535 whole = 1;
552 } 536 }
553 if (tp->t_rextslog_delta) { 537 if (tp->t_rextslog_delta) {
554 sbp->sb_rextslog += tp->t_rext 538 sbp->sb_rextslog += tp->t_rextslog_delta;
555 whole = 1; 539 whole = 1;
556 } 540 }
557 541
558 xfs_trans_buf_set_type(tp, bp, XFS_BLF 542 xfs_trans_buf_set_type(tp, bp, XFS_BLFT_SB_BUF);
559 if (whole) 543 if (whole)
560 /* 544 /*
561 * Log the whole thing, the fi 545 * Log the whole thing, the fields are noncontiguous.
562 */ 546 */
563 xfs_trans_log_buf(tp, bp, 0, s !! 547 xfs_trans_log_buf(tp, bp, 0, sizeof(xfs_dsb_t) - 1);
564 else 548 else
565 /* 549 /*
566 * Since all the modifiable fi 550 * Since all the modifiable fields are contiguous, we
567 * can get away with this. 551 * can get away with this.
568 */ 552 */
569 xfs_trans_log_buf(tp, bp, offs !! 553 xfs_trans_log_buf(tp, bp, offsetof(xfs_dsb_t, sb_icount),
570 offsetof(str !! 554 offsetof(xfs_dsb_t, sb_frextents) +
571 sizeof(sbp-> 555 sizeof(sbp->sb_frextents) - 1);
572 } 556 }
573 557
574 /* 558 /*
575 * xfs_trans_unreserve_and_mod_sb() is called 559 * xfs_trans_unreserve_and_mod_sb() is called to release unused reservations and
576 * apply superblock counter changes to the in- 560 * apply superblock counter changes to the in-core superblock. The
577 * t_res_fdblocks_delta and t_res_frextents_de 561 * t_res_fdblocks_delta and t_res_frextents_delta fields are explicitly NOT
578 * applied to the in-core superblock. The ide 562 * applied to the in-core superblock. The idea is that that has already been
579 * done. 563 * done.
580 * 564 *
581 * If we are not logging superblock counters, 565 * If we are not logging superblock counters, then the inode allocated/free and
582 * used block counts are not updated in the on 566 * used block counts are not updated in the on disk superblock. In this case,
583 * XFS_TRANS_SB_DIRTY will not be set when the 567 * XFS_TRANS_SB_DIRTY will not be set when the transaction is updated but we
584 * still need to update the incore superblock 568 * still need to update the incore superblock with the changes.
585 * 569 *
586 * Deltas for the inode count are +/-64, hence 570 * Deltas for the inode count are +/-64, hence we use a large batch size of 128
587 * so we don't need to take the counter lock o 571 * so we don't need to take the counter lock on every update.
588 */ 572 */
589 #define XFS_ICOUNT_BATCH 128 573 #define XFS_ICOUNT_BATCH 128
590 574
591 void 575 void
592 xfs_trans_unreserve_and_mod_sb( 576 xfs_trans_unreserve_and_mod_sb(
593 struct xfs_trans *tp) 577 struct xfs_trans *tp)
594 { 578 {
595 struct xfs_mount *mp = tp->t_mo 579 struct xfs_mount *mp = tp->t_mountp;
596 int64_t blkdelta = tp- !! 580 bool rsvd = (tp->t_flags & XFS_TRANS_RESERVE) != 0;
597 int64_t rtxdelta = tp- !! 581 int64_t blkdelta = 0;
>> 582 int64_t rtxdelta = 0;
598 int64_t idelta = 0; 583 int64_t idelta = 0;
599 int64_t ifreedelta = 0 584 int64_t ifreedelta = 0;
>> 585 int error;
600 586
601 /* !! 587 /* calculate deltas */
602 * Calculate the deltas. !! 588 if (tp->t_blk_res > 0)
603 * !! 589 blkdelta = tp->t_blk_res;
604 * t_fdblocks_delta and t_frextents_de !! 590 if ((tp->t_fdblocks_delta != 0) &&
605 * !! 591 (xfs_sb_version_haslazysbcount(&mp->m_sb) ||
606 * - positive values indicate blocks !! 592 (tp->t_flags & XFS_TRANS_SB_DIRTY)))
607 * - negative values indicate blocks <<
608 * <<
609 * Negative values can only happen if <<
610 * reservation that covers the allocat <<
611 * that the calculated delta values mu <<
612 * can only put back previous allocate <<
613 */ <<
614 ASSERT(tp->t_blk_res || tp->t_fdblocks <<
615 if (xfs_has_lazysbcount(mp) || (tp->t_ <<
616 blkdelta += tp->t_fdblocks_del 593 blkdelta += tp->t_fdblocks_delta;
617 ASSERT(blkdelta >= 0); <<
618 } <<
619 594
620 ASSERT(tp->t_rtx_res || tp->t_frextent !! 595 if (tp->t_rtx_res > 0)
621 if (tp->t_flags & XFS_TRANS_SB_DIRTY) !! 596 rtxdelta = tp->t_rtx_res;
>> 597 if ((tp->t_frextents_delta != 0) &&
>> 598 (tp->t_flags & XFS_TRANS_SB_DIRTY))
622 rtxdelta += tp->t_frextents_de 599 rtxdelta += tp->t_frextents_delta;
623 ASSERT(rtxdelta >= 0); <<
624 } <<
625 600
626 if (xfs_has_lazysbcount(mp) || (tp->t_ !! 601 if (xfs_sb_version_haslazysbcount(&mp->m_sb) ||
>> 602 (tp->t_flags & XFS_TRANS_SB_DIRTY)) {
627 idelta = tp->t_icount_delta; 603 idelta = tp->t_icount_delta;
628 ifreedelta = tp->t_ifree_delta 604 ifreedelta = tp->t_ifree_delta;
629 } 605 }
630 606
631 /* apply the per-cpu counters */ 607 /* apply the per-cpu counters */
632 if (blkdelta) !! 608 if (blkdelta) {
633 xfs_add_fdblocks(mp, blkdelta) !! 609 error = xfs_mod_fdblocks(mp, blkdelta, rsvd);
>> 610 ASSERT(!error);
>> 611 }
634 612
635 if (idelta) 613 if (idelta)
636 percpu_counter_add_batch(&mp-> 614 percpu_counter_add_batch(&mp->m_icount, idelta,
637 XFS_I 615 XFS_ICOUNT_BATCH);
638 616
639 if (ifreedelta) 617 if (ifreedelta)
640 percpu_counter_add(&mp->m_ifre 618 percpu_counter_add(&mp->m_ifree, ifreedelta);
641 619
642 if (rtxdelta) !! 620 if (rtxdelta == 0 && !(tp->t_flags & XFS_TRANS_SB_DIRTY))
643 xfs_add_frextents(mp, rtxdelta <<
644 <<
645 if (!(tp->t_flags & XFS_TRANS_SB_DIRTY <<
646 return; 621 return;
647 622
648 /* apply remaining deltas */ 623 /* apply remaining deltas */
649 spin_lock(&mp->m_sb_lock); 624 spin_lock(&mp->m_sb_lock);
650 mp->m_sb.sb_fdblocks += tp->t_fdblocks 625 mp->m_sb.sb_fdblocks += tp->t_fdblocks_delta + tp->t_res_fdblocks_delta;
651 mp->m_sb.sb_icount += idelta; 626 mp->m_sb.sb_icount += idelta;
652 mp->m_sb.sb_ifree += ifreedelta; 627 mp->m_sb.sb_ifree += ifreedelta;
653 /* !! 628 mp->m_sb.sb_frextents += rtxdelta;
654 * Do not touch sb_frextents here beca <<
655 * reservation. sb_frextents is not p <<
656 * must be consistent with the ondisk <<
657 * incore reservations. <<
658 */ <<
659 mp->m_sb.sb_dblocks += tp->t_dblocks_d 629 mp->m_sb.sb_dblocks += tp->t_dblocks_delta;
660 mp->m_sb.sb_agcount += tp->t_agcount_d 630 mp->m_sb.sb_agcount += tp->t_agcount_delta;
661 mp->m_sb.sb_imax_pct += tp->t_imaxpct_ 631 mp->m_sb.sb_imax_pct += tp->t_imaxpct_delta;
662 mp->m_sb.sb_rextsize += tp->t_rextsize 632 mp->m_sb.sb_rextsize += tp->t_rextsize_delta;
663 if (tp->t_rextsize_delta) { <<
664 mp->m_rtxblklog = log2_if_powe <<
665 mp->m_rtxblkmask = mask64_if_p <<
666 } <<
667 mp->m_sb.sb_rbmblocks += tp->t_rbmbloc 633 mp->m_sb.sb_rbmblocks += tp->t_rbmblocks_delta;
668 mp->m_sb.sb_rblocks += tp->t_rblocks_d 634 mp->m_sb.sb_rblocks += tp->t_rblocks_delta;
669 mp->m_sb.sb_rextents += tp->t_rextents 635 mp->m_sb.sb_rextents += tp->t_rextents_delta;
670 mp->m_sb.sb_rextslog += tp->t_rextslog 636 mp->m_sb.sb_rextslog += tp->t_rextslog_delta;
671 spin_unlock(&mp->m_sb_lock); 637 spin_unlock(&mp->m_sb_lock);
672 638
673 /* 639 /*
674 * Debug checks outside of the spinloc 640 * Debug checks outside of the spinlock so they don't lock up the
675 * machine if they fail. 641 * machine if they fail.
676 */ 642 */
677 ASSERT(mp->m_sb.sb_imax_pct >= 0); 643 ASSERT(mp->m_sb.sb_imax_pct >= 0);
678 ASSERT(mp->m_sb.sb_rextslog >= 0); 644 ASSERT(mp->m_sb.sb_rextslog >= 0);
>> 645 return;
679 } 646 }
680 647
681 /* Add the given log item to the transaction's 648 /* Add the given log item to the transaction's list of log items. */
682 void 649 void
683 xfs_trans_add_item( 650 xfs_trans_add_item(
684 struct xfs_trans *tp, 651 struct xfs_trans *tp,
685 struct xfs_log_item *lip) 652 struct xfs_log_item *lip)
686 { 653 {
687 ASSERT(lip->li_log == tp->t_mountp->m_ !! 654 ASSERT(lip->li_mountp == tp->t_mountp);
688 ASSERT(lip->li_ailp == tp->t_mountp->m 655 ASSERT(lip->li_ailp == tp->t_mountp->m_ail);
689 ASSERT(list_empty(&lip->li_trans)); 656 ASSERT(list_empty(&lip->li_trans));
690 ASSERT(!test_bit(XFS_LI_DIRTY, &lip->l 657 ASSERT(!test_bit(XFS_LI_DIRTY, &lip->li_flags));
691 658
692 list_add_tail(&lip->li_trans, &tp->t_i 659 list_add_tail(&lip->li_trans, &tp->t_items);
693 trace_xfs_trans_add_item(tp, _RET_IP_) 660 trace_xfs_trans_add_item(tp, _RET_IP_);
694 } 661 }
695 662
696 /* 663 /*
697 * Unlink the log item from the transaction. t 664 * Unlink the log item from the transaction. the log item is no longer
698 * considered dirty in this transaction, as th 665 * considered dirty in this transaction, as the linked transaction has
699 * finished, either by abort or commit complet 666 * finished, either by abort or commit completion.
700 */ 667 */
701 void 668 void
702 xfs_trans_del_item( 669 xfs_trans_del_item(
703 struct xfs_log_item *lip) 670 struct xfs_log_item *lip)
704 { 671 {
705 clear_bit(XFS_LI_DIRTY, &lip->li_flags 672 clear_bit(XFS_LI_DIRTY, &lip->li_flags);
706 list_del_init(&lip->li_trans); 673 list_del_init(&lip->li_trans);
707 } 674 }
708 675
709 /* Detach and unlock all of the items in a tra 676 /* Detach and unlock all of the items in a transaction */
710 static void 677 static void
711 xfs_trans_free_items( 678 xfs_trans_free_items(
712 struct xfs_trans *tp, 679 struct xfs_trans *tp,
713 bool abort) 680 bool abort)
714 { 681 {
715 struct xfs_log_item *lip, *next; 682 struct xfs_log_item *lip, *next;
716 683
717 trace_xfs_trans_free_items(tp, _RET_IP 684 trace_xfs_trans_free_items(tp, _RET_IP_);
718 685
719 list_for_each_entry_safe(lip, next, &t 686 list_for_each_entry_safe(lip, next, &tp->t_items, li_trans) {
720 xfs_trans_del_item(lip); 687 xfs_trans_del_item(lip);
721 if (abort) 688 if (abort)
722 set_bit(XFS_LI_ABORTED 689 set_bit(XFS_LI_ABORTED, &lip->li_flags);
723 if (lip->li_ops->iop_release) 690 if (lip->li_ops->iop_release)
724 lip->li_ops->iop_relea 691 lip->li_ops->iop_release(lip);
725 } 692 }
726 } 693 }
727 694
728 /* !! 695 static inline void
729 * Sort transaction items prior to running pre !! 696 xfs_log_item_batch_insert(
730 * attempt to order the items such that they w !! 697 struct xfs_ail *ailp,
731 * order. Items that have no sort function are !! 698 struct xfs_ail_cursor *cur,
732 * and so are locked last. !! 699 struct xfs_log_item **log_items,
733 * !! 700 int nr_items,
734 * This may need refinement as different types !! 701 xfs_lsn_t commit_lsn)
735 * !! 702 {
736 * Function is more complex than it needs to b !! 703 int i;
737 * values and the function only returns 32 bit !! 704
738 */ !! 705 spin_lock(&ailp->ail_lock);
739 static int !! 706 /* xfs_trans_ail_update_bulk drops ailp->ail_lock */
740 xfs_trans_precommit_sort( !! 707 xfs_trans_ail_update_bulk(ailp, cur, log_items, nr_items, commit_lsn);
741 void *unused_arg, <<
742 const struct list_head *a, <<
743 const struct list_head *b) <<
744 { <<
745 struct xfs_log_item *lia = contain <<
746 struct <<
747 struct xfs_log_item *lib = contain <<
748 struct <<
749 int64_t diff; <<
750 708
751 /* !! 709 for (i = 0; i < nr_items; i++) {
752 * If both items are non-sortable, lea !! 710 struct xfs_log_item *lip = log_items[i];
753 * sortable, move the non-sortable ite !! 711
754 */ !! 712 if (lip->li_ops->iop_unpin)
755 if (!lia->li_ops->iop_sort && !lib->li !! 713 lip->li_ops->iop_unpin(lip, 0);
756 return 0; !! 714 }
757 if (!lia->li_ops->iop_sort) <<
758 return 1; <<
759 if (!lib->li_ops->iop_sort) <<
760 return -1; <<
761 <<
762 diff = lia->li_ops->iop_sort(lia) - li <<
763 if (diff < 0) <<
764 return -1; <<
765 if (diff > 0) <<
766 return 1; <<
767 return 0; <<
768 } 715 }
769 716
770 /* 717 /*
771 * Run transaction precommit functions. !! 718 * Bulk operation version of xfs_trans_committed that takes a log vector of
>> 719 * items to insert into the AIL. This uses bulk AIL insertion techniques to
>> 720 * minimise lock traffic.
772 * 721 *
773 * If there is an error in any of the callouts !! 722 * If we are called with the aborted flag set, it is because a log write during
774 * trigger a shutdown to abort the transaction !! 723 * a CIL checkpoint commit has failed. In this case, all the items in the
775 * from errors at this point as the transactio !! 724 * checkpoint have already gone through iop_committed and iop_committing, which
>> 725 * means that checkpoint commit abort handling is treated exactly the same
>> 726 * as an iclog write error even though we haven't started any IO yet. Hence in
>> 727 * this case all we need to do is iop_committed processing, followed by an
>> 728 * iop_unpin(aborted) call.
>> 729 *
>> 730 * The AIL cursor is used to optimise the insert process. If commit_lsn is not
>> 731 * at the end of the AIL, the insert cursor avoids the need to walk
>> 732 * the AIL to find the insertion point on every xfs_log_item_batch_insert()
>> 733 * call. This saves a lot of needless list walking and is a net win, even
>> 734 * though it slightly increases that amount of AIL lock traffic to set it up
>> 735 * and tear it down.
776 */ 736 */
777 static int !! 737 void
778 xfs_trans_run_precommits( !! 738 xfs_trans_committed_bulk(
779 struct xfs_trans *tp) !! 739 struct xfs_ail *ailp,
780 { !! 740 struct xfs_log_vec *log_vector,
781 struct xfs_mount *mp = tp->t_mo !! 741 xfs_lsn_t commit_lsn,
782 struct xfs_log_item *lip, *n; !! 742 bool aborted)
783 int error = 0; !! 743 {
>> 744 #define LOG_ITEM_BATCH_SIZE 32
>> 745 struct xfs_log_item *log_items[LOG_ITEM_BATCH_SIZE];
>> 746 struct xfs_log_vec *lv;
>> 747 struct xfs_ail_cursor cur;
>> 748 int i = 0;
>> 749
>> 750 spin_lock(&ailp->ail_lock);
>> 751 xfs_trans_ail_cursor_last(ailp, &cur, commit_lsn);
>> 752 spin_unlock(&ailp->ail_lock);
>> 753
>> 754 /* unpin all the log items */
>> 755 for (lv = log_vector; lv; lv = lv->lv_next ) {
>> 756 struct xfs_log_item *lip = lv->lv_item;
>> 757 xfs_lsn_t item_lsn;
784 758
785 /* !! 759 if (aborted)
786 * Sort the item list to avoid ABBA de !! 760 set_bit(XFS_LI_ABORTED, &lip->li_flags);
787 * running precommit operations that l <<
788 * inode cluster buffers. <<
789 */ <<
790 list_sort(NULL, &tp->t_items, xfs_tran <<
791 761
792 /* !! 762 if (lip->li_ops->flags & XFS_ITEM_RELEASE_WHEN_COMMITTED) {
793 * Precommit operations can remove the !! 763 lip->li_ops->iop_release(lip);
794 * if the log item exists purely to de !! 764 continue;
795 * can be ordered against other operat !! 765 }
796 * list_for_each_entry_safe() here. !! 766
797 */ !! 767 if (lip->li_ops->iop_committed)
798 list_for_each_entry_safe(lip, n, &tp-> !! 768 item_lsn = lip->li_ops->iop_committed(lip, commit_lsn);
799 if (!test_bit(XFS_LI_DIRTY, &l !! 769 else
>> 770 item_lsn = commit_lsn;
>> 771
>> 772 /* item_lsn of -1 means the item needs no further processing */
>> 773 if (XFS_LSN_CMP(item_lsn, (xfs_lsn_t)-1) == 0)
>> 774 continue;
>> 775
>> 776 /*
>> 777 * if we are aborting the operation, no point in inserting the
>> 778 * object into the AIL as we are in a shutdown situation.
>> 779 */
>> 780 if (aborted) {
>> 781 ASSERT(XFS_FORCED_SHUTDOWN(ailp->ail_mount));
>> 782 if (lip->li_ops->iop_unpin)
>> 783 lip->li_ops->iop_unpin(lip, 1);
800 continue; 784 continue;
801 if (lip->li_ops->iop_precommit !! 785 }
802 error = lip->li_ops->i !! 786
803 if (error) !! 787 if (item_lsn != commit_lsn) {
804 break; !! 788
>> 789 /*
>> 790 * Not a bulk update option due to unusual item_lsn.
>> 791 * Push into AIL immediately, rechecking the lsn once
>> 792 * we have the ail lock. Then unpin the item. This does
>> 793 * not affect the AIL cursor the bulk insert path is
>> 794 * using.
>> 795 */
>> 796 spin_lock(&ailp->ail_lock);
>> 797 if (XFS_LSN_CMP(item_lsn, lip->li_lsn) > 0)
>> 798 xfs_trans_ail_update(ailp, lip, item_lsn);
>> 799 else
>> 800 spin_unlock(&ailp->ail_lock);
>> 801 if (lip->li_ops->iop_unpin)
>> 802 lip->li_ops->iop_unpin(lip, 0);
>> 803 continue;
>> 804 }
>> 805
>> 806 /* Item is a candidate for bulk AIL insert. */
>> 807 log_items[i++] = lv->lv_item;
>> 808 if (i >= LOG_ITEM_BATCH_SIZE) {
>> 809 xfs_log_item_batch_insert(ailp, &cur, log_items,
>> 810 LOG_ITEM_BATCH_SIZE, commit_lsn);
>> 811 i = 0;
805 } 812 }
806 } 813 }
807 if (error) !! 814
808 xfs_force_shutdown(mp, SHUTDOW !! 815 /* make sure we insert the remainder! */
809 return error; !! 816 if (i)
>> 817 xfs_log_item_batch_insert(ailp, &cur, log_items, i, commit_lsn);
>> 818
>> 819 spin_lock(&ailp->ail_lock);
>> 820 xfs_trans_ail_cursor_done(&cur);
>> 821 spin_unlock(&ailp->ail_lock);
810 } 822 }
811 823
812 /* 824 /*
813 * Commit the given transaction to the log. 825 * Commit the given transaction to the log.
814 * 826 *
815 * XFS disk error handling mechanism is not ba 827 * XFS disk error handling mechanism is not based on a typical
816 * transaction abort mechanism. Logically afte 828 * transaction abort mechanism. Logically after the filesystem
817 * gets marked 'SHUTDOWN', we can't let any ne 829 * gets marked 'SHUTDOWN', we can't let any new transactions
818 * be durable - ie. committed to disk - becaus 830 * be durable - ie. committed to disk - because some metadata might
819 * be inconsistent. In such cases, this return 831 * be inconsistent. In such cases, this returns an error, and the
820 * caller may assume that all locked objects j 832 * caller may assume that all locked objects joined to the transaction
821 * have already been unlocked as if the commit 833 * have already been unlocked as if the commit had succeeded.
822 * Do not reference the transaction structure 834 * Do not reference the transaction structure after this call.
823 */ 835 */
824 static int 836 static int
825 __xfs_trans_commit( 837 __xfs_trans_commit(
826 struct xfs_trans *tp, 838 struct xfs_trans *tp,
827 bool regrant) 839 bool regrant)
828 { 840 {
829 struct xfs_mount *mp = tp->t_mo 841 struct xfs_mount *mp = tp->t_mountp;
830 struct xlog *log = mp->m_l !! 842 xfs_lsn_t commit_lsn = -1;
831 xfs_csn_t commit_seq = 0 <<
832 int error = 0; 843 int error = 0;
833 int sync = tp->t_f 844 int sync = tp->t_flags & XFS_TRANS_SYNC;
834 845
835 trace_xfs_trans_commit(tp, _RET_IP_); 846 trace_xfs_trans_commit(tp, _RET_IP_);
836 847
837 error = xfs_trans_run_precommits(tp); <<
838 if (error) { <<
839 if (tp->t_flags & XFS_TRANS_PE <<
840 xfs_defer_cancel(tp); <<
841 goto out_unreserve; <<
842 } <<
843 <<
844 /* 848 /*
845 * Finish deferred items on final comm 849 * Finish deferred items on final commit. Only permanent transactions
846 * should ever have deferred ops. 850 * should ever have deferred ops.
847 */ 851 */
848 WARN_ON_ONCE(!list_empty(&tp->t_dfops) 852 WARN_ON_ONCE(!list_empty(&tp->t_dfops) &&
849 !(tp->t_flags & XFS_TRANS 853 !(tp->t_flags & XFS_TRANS_PERM_LOG_RES));
850 if (!regrant && (tp->t_flags & XFS_TRA 854 if (!regrant && (tp->t_flags & XFS_TRANS_PERM_LOG_RES)) {
851 error = xfs_defer_finish_norol 855 error = xfs_defer_finish_noroll(&tp);
852 if (error) 856 if (error)
853 goto out_unreserve; 857 goto out_unreserve;
854 <<
855 /* Run precommits from final t <<
856 error = xfs_trans_run_precommi <<
857 if (error) <<
858 goto out_unreserve; <<
859 } 858 }
860 859
861 /* 860 /*
862 * If there is nothing to be logged by 861 * If there is nothing to be logged by the transaction,
863 * then unlock all of the items associ 862 * then unlock all of the items associated with the
864 * transaction and free the transactio 863 * transaction and free the transaction structure.
865 * Also make sure to return any reserv 864 * Also make sure to return any reserved blocks to
866 * the free pool. 865 * the free pool.
867 */ 866 */
868 if (!(tp->t_flags & XFS_TRANS_DIRTY)) 867 if (!(tp->t_flags & XFS_TRANS_DIRTY))
869 goto out_unreserve; 868 goto out_unreserve;
870 869
871 /* !! 870 if (XFS_FORCED_SHUTDOWN(mp)) {
872 * We must check against log shutdown <<
873 * items and leave them dirty, inconsi <<
874 * the log is active. This leaves them <<
875 * disk, and that will lead to on-disk <<
876 */ <<
877 if (xlog_is_shutdown(log)) { <<
878 error = -EIO; 871 error = -EIO;
879 goto out_unreserve; 872 goto out_unreserve;
880 } 873 }
881 874
882 ASSERT(tp->t_ticket != NULL); 875 ASSERT(tp->t_ticket != NULL);
883 876
884 /* 877 /*
885 * If we need to update the superblock 878 * If we need to update the superblock, then do it now.
886 */ 879 */
887 if (tp->t_flags & XFS_TRANS_SB_DIRTY) 880 if (tp->t_flags & XFS_TRANS_SB_DIRTY)
888 xfs_trans_apply_sb_deltas(tp); 881 xfs_trans_apply_sb_deltas(tp);
889 xfs_trans_apply_dquot_deltas(tp); 882 xfs_trans_apply_dquot_deltas(tp);
890 883
891 xlog_cil_commit(log, tp, &commit_seq, !! 884 xfs_log_commit_cil(mp, tp, &commit_lsn, regrant);
892 885
893 xfs_trans_free(tp); 886 xfs_trans_free(tp);
894 887
895 /* 888 /*
896 * If the transaction needs to be sync 889 * If the transaction needs to be synchronous, then force the
897 * log out now and wait for it. 890 * log out now and wait for it.
898 */ 891 */
899 if (sync) { 892 if (sync) {
900 error = xfs_log_force_seq(mp, !! 893 error = xfs_log_force_lsn(mp, commit_lsn, XFS_LOG_SYNC, NULL);
901 XFS_STATS_INC(mp, xs_trans_syn 894 XFS_STATS_INC(mp, xs_trans_sync);
902 } else { 895 } else {
903 XFS_STATS_INC(mp, xs_trans_asy 896 XFS_STATS_INC(mp, xs_trans_async);
904 } 897 }
905 898
906 return error; 899 return error;
907 900
908 out_unreserve: 901 out_unreserve:
909 xfs_trans_unreserve_and_mod_sb(tp); 902 xfs_trans_unreserve_and_mod_sb(tp);
910 903
911 /* 904 /*
912 * It is indeed possible for the trans 905 * It is indeed possible for the transaction to be not dirty but
913 * the dqinfo portion to be. All that 906 * the dqinfo portion to be. All that means is that we have some
914 * (non-persistent) quota reservations 907 * (non-persistent) quota reservations that need to be unreserved.
915 */ 908 */
916 xfs_trans_unreserve_and_mod_dquots(tp) 909 xfs_trans_unreserve_and_mod_dquots(tp);
917 if (tp->t_ticket) { 910 if (tp->t_ticket) {
918 if (regrant && !xlog_is_shutdo !! 911 if (regrant && !XLOG_FORCED_SHUTDOWN(mp->m_log))
919 xfs_log_ticket_regrant !! 912 xfs_log_ticket_regrant(mp->m_log, tp->t_ticket);
920 else 913 else
921 xfs_log_ticket_ungrant !! 914 xfs_log_ticket_ungrant(mp->m_log, tp->t_ticket);
922 tp->t_ticket = NULL; 915 tp->t_ticket = NULL;
923 } 916 }
924 xfs_trans_free_items(tp, !!error); 917 xfs_trans_free_items(tp, !!error);
925 xfs_trans_free(tp); 918 xfs_trans_free(tp);
926 919
927 XFS_STATS_INC(mp, xs_trans_empty); 920 XFS_STATS_INC(mp, xs_trans_empty);
928 return error; 921 return error;
929 } 922 }
930 923
931 int 924 int
932 xfs_trans_commit( 925 xfs_trans_commit(
933 struct xfs_trans *tp) 926 struct xfs_trans *tp)
934 { 927 {
935 return __xfs_trans_commit(tp, false); 928 return __xfs_trans_commit(tp, false);
936 } 929 }
937 930
938 /* 931 /*
939 * Unlock all of the transaction's items and f !! 932 * Unlock all of the transaction's items and free the transaction.
940 * transaction is dirty, we must shut down the !! 933 * The transaction must not have modified any of its items, because
941 * way to restore them to their previous state !! 934 * there is no way to restore them to their previous state.
942 * <<
943 * If the transaction has made a log reservati <<
944 * well. <<
945 * 935 *
946 * This is a high level function (equivalent t !! 936 * If the transaction has made a log reservation, make sure to release
947 * be called after the transaction has effecti !! 937 * it as well.
948 * being shut down. However, if the mount has <<
949 * transaction is dirty we will shut the mount <<
950 * guarantees that the log is shut down, too. <<
951 * careful with shutdown state and dirty items <<
952 * xfs_trans_commit(). <<
953 */ 938 */
954 void 939 void
955 xfs_trans_cancel( 940 xfs_trans_cancel(
956 struct xfs_trans *tp) 941 struct xfs_trans *tp)
957 { 942 {
958 struct xfs_mount *mp = tp->t_mo 943 struct xfs_mount *mp = tp->t_mountp;
959 struct xlog *log = mp->m_l <<
960 bool dirty = (tp->t 944 bool dirty = (tp->t_flags & XFS_TRANS_DIRTY);
961 945
962 trace_xfs_trans_cancel(tp, _RET_IP_); 946 trace_xfs_trans_cancel(tp, _RET_IP_);
963 947
964 /* !! 948 if (tp->t_flags & XFS_TRANS_PERM_LOG_RES)
965 * It's never valid to cancel a transa <<
966 * because the transaction is effectiv <<
967 * loudly before freeing the in-memory <<
968 * filesystem. <<
969 */ <<
970 if (!list_empty(&tp->t_dfops)) { <<
971 ASSERT(tp->t_flags & XFS_TRANS <<
972 dirty = true; <<
973 xfs_defer_cancel(tp); 949 xfs_defer_cancel(tp);
974 } <<
975 950
976 /* 951 /*
977 * See if the caller is relying on us !! 952 * See if the caller is relying on us to shut down the
978 * only want an error report if there !! 953 * filesystem. This happens in paths where we detect
979 * progress, so we only need to check !! 954 * corruption and decide to give up.
980 * here. <<
981 */ 955 */
982 if (dirty && !xfs_is_shutdown(mp)) { !! 956 if (dirty && !XFS_FORCED_SHUTDOWN(mp)) {
983 XFS_ERROR_REPORT("xfs_trans_ca 957 XFS_ERROR_REPORT("xfs_trans_cancel", XFS_ERRLEVEL_LOW, mp);
984 xfs_force_shutdown(mp, SHUTDOW 958 xfs_force_shutdown(mp, SHUTDOWN_CORRUPT_INCORE);
985 } 959 }
986 #ifdef DEBUG 960 #ifdef DEBUG
987 /* Log items need to be consistent unt !! 961 if (!dirty && !XFS_FORCED_SHUTDOWN(mp)) {
988 if (!dirty && !xlog_is_shutdown(log)) <<
989 struct xfs_log_item *lip; 962 struct xfs_log_item *lip;
990 963
991 list_for_each_entry(lip, &tp-> 964 list_for_each_entry(lip, &tp->t_items, li_trans)
992 ASSERT(!xlog_item_is_i 965 ASSERT(!xlog_item_is_intent_done(lip));
993 } 966 }
994 #endif 967 #endif
995 xfs_trans_unreserve_and_mod_sb(tp); 968 xfs_trans_unreserve_and_mod_sb(tp);
996 xfs_trans_unreserve_and_mod_dquots(tp) 969 xfs_trans_unreserve_and_mod_dquots(tp);
997 970
998 if (tp->t_ticket) { 971 if (tp->t_ticket) {
999 xfs_log_ticket_ungrant(log, tp !! 972 xfs_log_ticket_ungrant(mp->m_log, tp->t_ticket);
1000 tp->t_ticket = NULL; 973 tp->t_ticket = NULL;
1001 } 974 }
1002 975
1003 xfs_trans_free_items(tp, dirty); 976 xfs_trans_free_items(tp, dirty);
1004 xfs_trans_free(tp); 977 xfs_trans_free(tp);
1005 } 978 }
1006 979
1007 /* 980 /*
1008 * Roll from one trans in the sequence of PER 981 * Roll from one trans in the sequence of PERMANENT transactions to
1009 * the next: permanent transactions are only 982 * the next: permanent transactions are only flushed out when
1010 * committed with xfs_trans_commit(), but we 983 * committed with xfs_trans_commit(), but we still want as soon
1011 * as possible to let chunks of it go to the 984 * as possible to let chunks of it go to the log. So we commit the
1012 * chunk we've been working on and get a new 985 * chunk we've been working on and get a new transaction to continue.
1013 */ 986 */
1014 int 987 int
1015 xfs_trans_roll( 988 xfs_trans_roll(
1016 struct xfs_trans **tpp) 989 struct xfs_trans **tpp)
1017 { 990 {
1018 struct xfs_trans *trans = *tpp 991 struct xfs_trans *trans = *tpp;
1019 struct xfs_trans_res tres; 992 struct xfs_trans_res tres;
1020 int error; 993 int error;
1021 994
1022 trace_xfs_trans_roll(trans, _RET_IP_) 995 trace_xfs_trans_roll(trans, _RET_IP_);
1023 996
1024 /* 997 /*
1025 * Copy the critical parameters from 998 * Copy the critical parameters from one trans to the next.
1026 */ 999 */
1027 tres.tr_logres = trans->t_log_res; 1000 tres.tr_logres = trans->t_log_res;
1028 tres.tr_logcount = trans->t_log_count 1001 tres.tr_logcount = trans->t_log_count;
1029 1002
1030 *tpp = xfs_trans_dup(trans); 1003 *tpp = xfs_trans_dup(trans);
1031 1004
1032 /* 1005 /*
1033 * Commit the current transaction. 1006 * Commit the current transaction.
1034 * If this commit failed, then it'd j 1007 * If this commit failed, then it'd just unlock those items that
1035 * are not marked ihold. That also me 1008 * are not marked ihold. That also means that a filesystem shutdown
1036 * is in progress. The caller takes t 1009 * is in progress. The caller takes the responsibility to cancel
1037 * the duplicate transaction that get 1010 * the duplicate transaction that gets returned.
1038 */ 1011 */
1039 error = __xfs_trans_commit(trans, tru 1012 error = __xfs_trans_commit(trans, true);
1040 if (error) 1013 if (error)
1041 return error; 1014 return error;
1042 1015
1043 /* 1016 /*
1044 * Reserve space in the log for the n 1017 * Reserve space in the log for the next transaction.
1045 * This also pushes items in the "AIL 1018 * This also pushes items in the "AIL", the list of logged items,
1046 * out to disk if they are taking up 1019 * out to disk if they are taking up space at the tail of the log
1047 * that we want to use. This require 1020 * that we want to use. This requires that either nothing be locked
1048 * across this call, or that anything 1021 * across this call, or that anything that is locked be logged in
1049 * the prior and the next transaction 1022 * the prior and the next transactions.
1050 */ 1023 */
1051 tres.tr_logflags = XFS_TRANS_PERM_LOG 1024 tres.tr_logflags = XFS_TRANS_PERM_LOG_RES;
1052 return xfs_trans_reserve(*tpp, &tres, 1025 return xfs_trans_reserve(*tpp, &tres, 0, 0);
1053 } 1026 }
1054 1027
1055 /* 1028 /*
1056 * Allocate an transaction, lock and join the 1029 * Allocate an transaction, lock and join the inode to it, and reserve quota.
1057 * 1030 *
1058 * The caller must ensure that the on-disk dq 1031 * The caller must ensure that the on-disk dquots attached to this inode have
1059 * already been allocated and initialized. T 1032 * already been allocated and initialized. The caller is responsible for
1060 * releasing ILOCK_EXCL if a new transaction 1033 * releasing ILOCK_EXCL if a new transaction is returned.
1061 */ 1034 */
1062 int 1035 int
1063 xfs_trans_alloc_inode( 1036 xfs_trans_alloc_inode(
1064 struct xfs_inode *ip, 1037 struct xfs_inode *ip,
1065 struct xfs_trans_res *resv, 1038 struct xfs_trans_res *resv,
1066 unsigned int dblocks, 1039 unsigned int dblocks,
1067 unsigned int rblocks, 1040 unsigned int rblocks,
1068 bool force, 1041 bool force,
1069 struct xfs_trans **tpp) 1042 struct xfs_trans **tpp)
1070 { 1043 {
1071 struct xfs_trans *tp; 1044 struct xfs_trans *tp;
1072 struct xfs_mount *mp = ip->i_m 1045 struct xfs_mount *mp = ip->i_mount;
1073 bool retried = fal 1046 bool retried = false;
1074 int error; 1047 int error;
1075 1048
1076 retry: 1049 retry:
1077 error = xfs_trans_alloc(mp, resv, dbl 1050 error = xfs_trans_alloc(mp, resv, dblocks,
1078 xfs_extlen_to_rtxlen( !! 1051 rblocks / mp->m_sb.sb_rextsize,
1079 force ? XFS_TRANS_RES 1052 force ? XFS_TRANS_RESERVE : 0, &tp);
1080 if (error) 1053 if (error)
1081 return error; 1054 return error;
1082 1055
1083 xfs_ilock(ip, XFS_ILOCK_EXCL); 1056 xfs_ilock(ip, XFS_ILOCK_EXCL);
1084 xfs_trans_ijoin(tp, ip, 0); 1057 xfs_trans_ijoin(tp, ip, 0);
1085 1058
1086 error = xfs_qm_dqattach_locked(ip, fa 1059 error = xfs_qm_dqattach_locked(ip, false);
1087 if (error) { 1060 if (error) {
1088 /* Caller should have allocat 1061 /* Caller should have allocated the dquots! */
1089 ASSERT(error != -ENOENT); 1062 ASSERT(error != -ENOENT);
1090 goto out_cancel; 1063 goto out_cancel;
1091 } 1064 }
1092 1065
1093 error = xfs_trans_reserve_quota_nblks 1066 error = xfs_trans_reserve_quota_nblks(tp, ip, dblocks, rblocks, force);
1094 if ((error == -EDQUOT || error == -EN 1067 if ((error == -EDQUOT || error == -ENOSPC) && !retried) {
1095 xfs_trans_cancel(tp); 1068 xfs_trans_cancel(tp);
1096 xfs_iunlock(ip, XFS_ILOCK_EXC 1069 xfs_iunlock(ip, XFS_ILOCK_EXCL);
1097 xfs_blockgc_free_quota(ip, 0) 1070 xfs_blockgc_free_quota(ip, 0);
1098 retried = true; 1071 retried = true;
1099 goto retry; 1072 goto retry;
1100 } 1073 }
1101 if (error) 1074 if (error)
1102 goto out_cancel; 1075 goto out_cancel;
1103 1076
1104 *tpp = tp; 1077 *tpp = tp;
1105 return 0; 1078 return 0;
1106 1079
1107 out_cancel: 1080 out_cancel:
1108 xfs_trans_cancel(tp); 1081 xfs_trans_cancel(tp);
1109 xfs_iunlock(ip, XFS_ILOCK_EXCL); 1082 xfs_iunlock(ip, XFS_ILOCK_EXCL);
1110 return error; 1083 return error;
1111 } 1084 }
1112 1085
1113 /* 1086 /*
1114 * Try to reserve more blocks for a transacti <<
1115 * <<
1116 * This is for callers that need to attach re <<
1117 * those resources to determine the space res <<
1118 * modify the attached resources. In other w <<
1119 * fail due to ENOSPC, so the caller must be <<
1120 * without shutting down the fs. <<
1121 */ <<
1122 int <<
1123 xfs_trans_reserve_more( <<
1124 struct xfs_trans *tp, <<
1125 unsigned int blocks, <<
1126 unsigned int rtextents) <<
1127 { <<
1128 struct xfs_trans_res resv = { }; <<
1129 <<
1130 return xfs_trans_reserve(tp, &resv, b <<
1131 } <<
1132 <<
1133 /* <<
1134 * Try to reserve more blocks and file quota <<
1135 * conditions of usage as xfs_trans_reserve_m <<
1136 */ <<
1137 int <<
1138 xfs_trans_reserve_more_inode( <<
1139 struct xfs_trans *tp, <<
1140 struct xfs_inode *ip, <<
1141 unsigned int dblocks, <<
1142 unsigned int rblocks, <<
1143 bool force_quota) <<
1144 { <<
1145 struct xfs_trans_res resv = { }; <<
1146 struct xfs_mount *mp = ip->i_m <<
1147 unsigned int rtx = xfs_ext <<
1148 int error; <<
1149 <<
1150 xfs_assert_ilocked(ip, XFS_ILOCK_EXCL <<
1151 <<
1152 error = xfs_trans_reserve(tp, &resv, <<
1153 if (error) <<
1154 return error; <<
1155 <<
1156 if (!XFS_IS_QUOTA_ON(mp) || xfs_is_qu <<
1157 return 0; <<
1158 <<
1159 if (tp->t_flags & XFS_TRANS_RESERVE) <<
1160 force_quota = true; <<
1161 <<
1162 error = xfs_trans_reserve_quota_nblks <<
1163 force_quota); <<
1164 if (!error) <<
1165 return 0; <<
1166 <<
1167 /* Quota failed, give back the new re <<
1168 xfs_add_fdblocks(mp, dblocks); <<
1169 tp->t_blk_res -= dblocks; <<
1170 xfs_add_frextents(mp, rtx); <<
1171 tp->t_rtx_res -= rtx; <<
1172 return error; <<
1173 } <<
1174 <<
1175 /* <<
1176 * Allocate an transaction in preparation for 1087 * Allocate an transaction in preparation for inode creation by reserving quota
1177 * against the given dquots. Callers are not 1088 * against the given dquots. Callers are not required to hold any inode locks.
1178 */ 1089 */
1179 int 1090 int
1180 xfs_trans_alloc_icreate( 1091 xfs_trans_alloc_icreate(
1181 struct xfs_mount *mp, 1092 struct xfs_mount *mp,
1182 struct xfs_trans_res *resv, 1093 struct xfs_trans_res *resv,
1183 struct xfs_dquot *udqp, 1094 struct xfs_dquot *udqp,
1184 struct xfs_dquot *gdqp, 1095 struct xfs_dquot *gdqp,
1185 struct xfs_dquot *pdqp, 1096 struct xfs_dquot *pdqp,
1186 unsigned int dblocks, 1097 unsigned int dblocks,
1187 struct xfs_trans **tpp) 1098 struct xfs_trans **tpp)
1188 { 1099 {
1189 struct xfs_trans *tp; 1100 struct xfs_trans *tp;
1190 bool retried = fal 1101 bool retried = false;
1191 int error; 1102 int error;
1192 1103
1193 retry: 1104 retry:
1194 error = xfs_trans_alloc(mp, resv, dbl 1105 error = xfs_trans_alloc(mp, resv, dblocks, 0, 0, &tp);
1195 if (error) 1106 if (error)
1196 return error; 1107 return error;
1197 1108
1198 error = xfs_trans_reserve_quota_icrea 1109 error = xfs_trans_reserve_quota_icreate(tp, udqp, gdqp, pdqp, dblocks);
1199 if ((error == -EDQUOT || error == -EN 1110 if ((error == -EDQUOT || error == -ENOSPC) && !retried) {
1200 xfs_trans_cancel(tp); 1111 xfs_trans_cancel(tp);
1201 xfs_blockgc_free_dquots(mp, u 1112 xfs_blockgc_free_dquots(mp, udqp, gdqp, pdqp, 0);
1202 retried = true; 1113 retried = true;
1203 goto retry; 1114 goto retry;
1204 } 1115 }
1205 if (error) { 1116 if (error) {
1206 xfs_trans_cancel(tp); 1117 xfs_trans_cancel(tp);
1207 return error; 1118 return error;
1208 } 1119 }
1209 1120
1210 *tpp = tp; 1121 *tpp = tp;
1211 return 0; 1122 return 0;
1212 } 1123 }
1213 1124
1214 /* 1125 /*
1215 * Allocate an transaction, lock and join the 1126 * Allocate an transaction, lock and join the inode to it, and reserve quota
1216 * in preparation for inode attribute changes 1127 * in preparation for inode attribute changes that include uid, gid, or prid
1217 * changes. 1128 * changes.
1218 * 1129 *
1219 * The caller must ensure that the on-disk dq 1130 * The caller must ensure that the on-disk dquots attached to this inode have
1220 * already been allocated and initialized. T 1131 * already been allocated and initialized. The ILOCK will be dropped when the
1221 * transaction is committed or cancelled. 1132 * transaction is committed or cancelled.
1222 */ 1133 */
1223 int 1134 int
1224 xfs_trans_alloc_ichange( 1135 xfs_trans_alloc_ichange(
1225 struct xfs_inode *ip, 1136 struct xfs_inode *ip,
1226 struct xfs_dquot *new_udqp, 1137 struct xfs_dquot *new_udqp,
1227 struct xfs_dquot *new_gdqp, 1138 struct xfs_dquot *new_gdqp,
1228 struct xfs_dquot *new_pdqp, 1139 struct xfs_dquot *new_pdqp,
1229 bool force, 1140 bool force,
1230 struct xfs_trans **tpp) 1141 struct xfs_trans **tpp)
1231 { 1142 {
1232 struct xfs_trans *tp; 1143 struct xfs_trans *tp;
1233 struct xfs_mount *mp = ip->i_m 1144 struct xfs_mount *mp = ip->i_mount;
1234 struct xfs_dquot *udqp; 1145 struct xfs_dquot *udqp;
1235 struct xfs_dquot *gdqp; 1146 struct xfs_dquot *gdqp;
1236 struct xfs_dquot *pdqp; 1147 struct xfs_dquot *pdqp;
1237 bool retried = fal 1148 bool retried = false;
1238 int error; 1149 int error;
1239 1150
1240 retry: 1151 retry:
1241 error = xfs_trans_alloc(mp, &M_RES(mp 1152 error = xfs_trans_alloc(mp, &M_RES(mp)->tr_ichange, 0, 0, 0, &tp);
1242 if (error) 1153 if (error)
1243 return error; 1154 return error;
1244 1155
1245 xfs_ilock(ip, XFS_ILOCK_EXCL); 1156 xfs_ilock(ip, XFS_ILOCK_EXCL);
1246 xfs_trans_ijoin(tp, ip, XFS_ILOCK_EXC 1157 xfs_trans_ijoin(tp, ip, XFS_ILOCK_EXCL);
1247 1158
1248 error = xfs_qm_dqattach_locked(ip, fa 1159 error = xfs_qm_dqattach_locked(ip, false);
1249 if (error) { 1160 if (error) {
1250 /* Caller should have allocat 1161 /* Caller should have allocated the dquots! */
1251 ASSERT(error != -ENOENT); 1162 ASSERT(error != -ENOENT);
1252 goto out_cancel; 1163 goto out_cancel;
1253 } 1164 }
1254 1165
1255 /* 1166 /*
1256 * For each quota type, skip quota re 1167 * For each quota type, skip quota reservations if the inode's dquots
1257 * now match the ones that came from 1168 * now match the ones that came from the caller, or the caller didn't
1258 * pass one in. The inode's dquots c 1169 * pass one in. The inode's dquots can change if we drop the ILOCK to
1259 * perform a blockgc scan, so we must 1170 * perform a blockgc scan, so we must preserve the caller's arguments.
1260 */ 1171 */
1261 udqp = (new_udqp != ip->i_udquot) ? n 1172 udqp = (new_udqp != ip->i_udquot) ? new_udqp : NULL;
1262 gdqp = (new_gdqp != ip->i_gdquot) ? n 1173 gdqp = (new_gdqp != ip->i_gdquot) ? new_gdqp : NULL;
1263 pdqp = (new_pdqp != ip->i_pdquot) ? n 1174 pdqp = (new_pdqp != ip->i_pdquot) ? new_pdqp : NULL;
1264 if (udqp || gdqp || pdqp) { 1175 if (udqp || gdqp || pdqp) {
1265 unsigned int qflags = XFS_ 1176 unsigned int qflags = XFS_QMOPT_RES_REGBLKS;
1266 1177
1267 if (force) 1178 if (force)
1268 qflags |= XFS_QMOPT_F 1179 qflags |= XFS_QMOPT_FORCE_RES;
1269 1180
1270 /* 1181 /*
1271 * Reserve enough quota to ha 1182 * Reserve enough quota to handle blocks on disk and reserved
1272 * for a delayed allocation. 1183 * for a delayed allocation. We'll actually transfer the
1273 * delalloc reservation betwe 1184 * delalloc reservation between dquots at chown time, even
1274 * though that part is only s 1185 * though that part is only semi-transactional.
1275 */ 1186 */
1276 error = xfs_trans_reserve_quo 1187 error = xfs_trans_reserve_quota_bydquots(tp, mp, udqp, gdqp,
1277 pdqp, ip->i_n 1188 pdqp, ip->i_nblocks + ip->i_delayed_blks,
1278 1, qflags); 1189 1, qflags);
1279 if ((error == -EDQUOT || erro 1190 if ((error == -EDQUOT || error == -ENOSPC) && !retried) {
1280 xfs_trans_cancel(tp); 1191 xfs_trans_cancel(tp);
1281 xfs_blockgc_free_dquo 1192 xfs_blockgc_free_dquots(mp, udqp, gdqp, pdqp, 0);
1282 retried = true; 1193 retried = true;
1283 goto retry; 1194 goto retry;
1284 } 1195 }
1285 if (error) 1196 if (error)
1286 goto out_cancel; 1197 goto out_cancel;
1287 } 1198 }
1288 1199
1289 *tpp = tp; 1200 *tpp = tp;
1290 return 0; <<
1291 <<
1292 out_cancel: <<
1293 xfs_trans_cancel(tp); <<
1294 return error; <<
1295 } <<
1296 <<
1297 /* <<
1298 * Allocate an transaction, lock and join the <<
1299 * and reserve quota for a directory update. <<
1300 * @dblocks will be set to zero for a reserva <<
1301 * @nospace_error will be set to a negative e <<
1302 * constraint we hit. <<
1303 * <<
1304 * The caller must ensure that the on-disk dq <<
1305 * already been allocated and initialized. T <<
1306 * transaction is committed or cancelled. <<
1307 * <<
1308 * Caller is responsible for unlocking the in <<
1309 */ <<
1310 int <<
1311 xfs_trans_alloc_dir( <<
1312 struct xfs_inode *dp, <<
1313 struct xfs_trans_res *resv, <<
1314 struct xfs_inode *ip, <<
1315 unsigned int *dblocks, <<
1316 struct xfs_trans **tpp, <<
1317 int *nospace_erro <<
1318 { <<
1319 struct xfs_trans *tp; <<
1320 struct xfs_mount *mp = ip->i_m <<
1321 unsigned int resblks; <<
1322 bool retried = fal <<
1323 int error; <<
1324 <<
1325 retry: <<
1326 *nospace_error = 0; <<
1327 resblks = *dblocks; <<
1328 error = xfs_trans_alloc(mp, resv, res <<
1329 if (error == -ENOSPC) { <<
1330 *nospace_error = error; <<
1331 resblks = 0; <<
1332 error = xfs_trans_alloc(mp, r <<
1333 } <<
1334 if (error) <<
1335 return error; <<
1336 <<
1337 xfs_lock_two_inodes(dp, XFS_ILOCK_EXC <<
1338 <<
1339 xfs_trans_ijoin(tp, dp, 0); <<
1340 xfs_trans_ijoin(tp, ip, 0); <<
1341 <<
1342 error = xfs_qm_dqattach_locked(dp, fa <<
1343 if (error) { <<
1344 /* Caller should have allocat <<
1345 ASSERT(error != -ENOENT); <<
1346 goto out_cancel; <<
1347 } <<
1348 <<
1349 error = xfs_qm_dqattach_locked(ip, fa <<
1350 if (error) { <<
1351 /* Caller should have allocat <<
1352 ASSERT(error != -ENOENT); <<
1353 goto out_cancel; <<
1354 } <<
1355 <<
1356 if (resblks == 0) <<
1357 goto done; <<
1358 <<
1359 error = xfs_trans_reserve_quota_nblks <<
1360 if (error == -EDQUOT || error == -ENO <<
1361 if (!retried) { <<
1362 xfs_trans_cancel(tp); <<
1363 xfs_iunlock(dp, XFS_I <<
1364 if (dp != ip) <<
1365 xfs_iunlock(i <<
1366 xfs_blockgc_free_quot <<
1367 retried = true; <<
1368 goto retry; <<
1369 } <<
1370 <<
1371 *nospace_error = error; <<
1372 resblks = 0; <<
1373 error = 0; <<
1374 } <<
1375 if (error) <<
1376 goto out_cancel; <<
1377 <<
1378 done: <<
1379 *tpp = tp; <<
1380 *dblocks = resblks; <<
1381 return 0; 1201 return 0;
1382 1202
1383 out_cancel: 1203 out_cancel:
1384 xfs_trans_cancel(tp); 1204 xfs_trans_cancel(tp);
1385 return error; 1205 return error;
1386 } 1206 }
1387 1207
Linux® is a registered trademark of Linus Torvalds in the United States and other countries.
TOMOYO® is a registered trademark of NTT DATA CORPORATION.