1 // SPDX-License-Identifier: GPL-2.0-or-later 1 // SPDX-License-Identifier: GPL-2.0-or-later
2 /* 2 /*
3 * Copyright (C) 2002, 2004 Oracle. All right 3 * Copyright (C) 2002, 2004 Oracle. All rights reserved.
4 */ 4 */
5 5
6 #include <linux/fs.h> 6 #include <linux/fs.h>
7 #include <linux/slab.h> 7 #include <linux/slab.h>
8 #include <linux/highmem.h> 8 #include <linux/highmem.h>
9 #include <linux/pagemap.h> 9 #include <linux/pagemap.h>
10 #include <asm/byteorder.h> 10 #include <asm/byteorder.h>
11 #include <linux/swap.h> 11 #include <linux/swap.h>
12 #include <linux/mpage.h> 12 #include <linux/mpage.h>
13 #include <linux/quotaops.h> 13 #include <linux/quotaops.h>
14 #include <linux/blkdev.h> 14 #include <linux/blkdev.h>
15 #include <linux/uio.h> 15 #include <linux/uio.h>
16 #include <linux/mm.h> 16 #include <linux/mm.h>
17 17
18 #include <cluster/masklog.h> 18 #include <cluster/masklog.h>
19 19
20 #include "ocfs2.h" 20 #include "ocfs2.h"
21 21
22 #include "alloc.h" 22 #include "alloc.h"
23 #include "aops.h" 23 #include "aops.h"
24 #include "dlmglue.h" 24 #include "dlmglue.h"
25 #include "extent_map.h" 25 #include "extent_map.h"
26 #include "file.h" 26 #include "file.h"
27 #include "inode.h" 27 #include "inode.h"
28 #include "journal.h" 28 #include "journal.h"
29 #include "suballoc.h" 29 #include "suballoc.h"
30 #include "super.h" 30 #include "super.h"
31 #include "symlink.h" 31 #include "symlink.h"
32 #include "refcounttree.h" 32 #include "refcounttree.h"
33 #include "ocfs2_trace.h" 33 #include "ocfs2_trace.h"
34 34
35 #include "buffer_head_io.h" 35 #include "buffer_head_io.h"
36 #include "dir.h" 36 #include "dir.h"
37 #include "namei.h" 37 #include "namei.h"
38 #include "sysfile.h" 38 #include "sysfile.h"
39 39
40 static int ocfs2_symlink_get_block(struct inod 40 static int ocfs2_symlink_get_block(struct inode *inode, sector_t iblock,
41 struct buff 41 struct buffer_head *bh_result, int create)
42 { 42 {
43 int err = -EIO; 43 int err = -EIO;
44 int status; 44 int status;
45 struct ocfs2_dinode *fe = NULL; 45 struct ocfs2_dinode *fe = NULL;
46 struct buffer_head *bh = NULL; 46 struct buffer_head *bh = NULL;
47 struct buffer_head *buffer_cache_bh = 47 struct buffer_head *buffer_cache_bh = NULL;
48 struct ocfs2_super *osb = OCFS2_SB(ino 48 struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
49 void *kaddr; 49 void *kaddr;
50 50
51 trace_ocfs2_symlink_get_block( 51 trace_ocfs2_symlink_get_block(
52 (unsigned long long)OC 52 (unsigned long long)OCFS2_I(inode)->ip_blkno,
53 (unsigned long long)ib 53 (unsigned long long)iblock, bh_result, create);
54 54
55 BUG_ON(ocfs2_inode_is_fast_symlink(ino 55 BUG_ON(ocfs2_inode_is_fast_symlink(inode));
56 56
57 if ((iblock << inode->i_sb->s_blocksiz 57 if ((iblock << inode->i_sb->s_blocksize_bits) > PATH_MAX + 1) {
58 mlog(ML_ERROR, "block offset > 58 mlog(ML_ERROR, "block offset > PATH_MAX: %llu",
59 (unsigned long long)ibloc 59 (unsigned long long)iblock);
60 goto bail; 60 goto bail;
61 } 61 }
62 62
63 status = ocfs2_read_inode_block(inode, 63 status = ocfs2_read_inode_block(inode, &bh);
64 if (status < 0) { 64 if (status < 0) {
65 mlog_errno(status); 65 mlog_errno(status);
66 goto bail; 66 goto bail;
67 } 67 }
68 fe = (struct ocfs2_dinode *) bh->b_dat 68 fe = (struct ocfs2_dinode *) bh->b_data;
69 69
70 if ((u64)iblock >= ocfs2_clusters_to_b 70 if ((u64)iblock >= ocfs2_clusters_to_blocks(inode->i_sb,
71 71 le32_to_cpu(fe->i_clusters))) {
72 err = -ENOMEM; 72 err = -ENOMEM;
73 mlog(ML_ERROR, "block offset i 73 mlog(ML_ERROR, "block offset is outside the allocated size: "
74 "%llu\n", (unsigned long 74 "%llu\n", (unsigned long long)iblock);
75 goto bail; 75 goto bail;
76 } 76 }
77 77
78 /* We don't use the page cache to crea 78 /* We don't use the page cache to create symlink data, so if
79 * need be, copy it over from the buff 79 * need be, copy it over from the buffer cache. */
80 if (!buffer_uptodate(bh_result) && ocf 80 if (!buffer_uptodate(bh_result) && ocfs2_inode_is_new(inode)) {
81 u64 blkno = le64_to_cpu(fe->id 81 u64 blkno = le64_to_cpu(fe->id2.i_list.l_recs[0].e_blkno) +
82 iblock; 82 iblock;
83 buffer_cache_bh = sb_getblk(os 83 buffer_cache_bh = sb_getblk(osb->sb, blkno);
84 if (!buffer_cache_bh) { 84 if (!buffer_cache_bh) {
85 err = -ENOMEM; 85 err = -ENOMEM;
86 mlog(ML_ERROR, "couldn 86 mlog(ML_ERROR, "couldn't getblock for symlink!\n");
87 goto bail; 87 goto bail;
88 } 88 }
89 89
90 /* we haven't locked out trans 90 /* we haven't locked out transactions, so a commit
91 * could've happened. Since we 91 * could've happened. Since we've got a reference on
92 * the bh, even if it commits 92 * the bh, even if it commits while we're doing the
93 * copy, the data is still goo 93 * copy, the data is still good. */
94 if (buffer_jbd(buffer_cache_bh 94 if (buffer_jbd(buffer_cache_bh)
95 && ocfs2_inode_is_new(inod 95 && ocfs2_inode_is_new(inode)) {
96 kaddr = kmap_atomic(bh 96 kaddr = kmap_atomic(bh_result->b_page);
97 if (!kaddr) { 97 if (!kaddr) {
98 mlog(ML_ERROR, 98 mlog(ML_ERROR, "couldn't kmap!\n");
99 goto bail; 99 goto bail;
100 } 100 }
101 memcpy(kaddr + (bh_res 101 memcpy(kaddr + (bh_result->b_size * iblock),
102 buffer_cache_bh 102 buffer_cache_bh->b_data,
103 bh_result->b_si 103 bh_result->b_size);
104 kunmap_atomic(kaddr); 104 kunmap_atomic(kaddr);
105 set_buffer_uptodate(bh 105 set_buffer_uptodate(bh_result);
106 } 106 }
107 brelse(buffer_cache_bh); 107 brelse(buffer_cache_bh);
108 } 108 }
109 109
110 map_bh(bh_result, inode->i_sb, 110 map_bh(bh_result, inode->i_sb,
111 le64_to_cpu(fe->id2.i_list.l_re 111 le64_to_cpu(fe->id2.i_list.l_recs[0].e_blkno) + iblock);
112 112
113 err = 0; 113 err = 0;
114 114
115 bail: 115 bail:
116 brelse(bh); 116 brelse(bh);
117 117
118 return err; 118 return err;
119 } 119 }
120 120
121 static int ocfs2_lock_get_block(struct inode * 121 static int ocfs2_lock_get_block(struct inode *inode, sector_t iblock,
122 struct buffer_head *bh_res 122 struct buffer_head *bh_result, int create)
123 { 123 {
124 int ret = 0; 124 int ret = 0;
125 struct ocfs2_inode_info *oi = OCFS2_I( 125 struct ocfs2_inode_info *oi = OCFS2_I(inode);
126 126
127 down_read(&oi->ip_alloc_sem); 127 down_read(&oi->ip_alloc_sem);
128 ret = ocfs2_get_block(inode, iblock, b 128 ret = ocfs2_get_block(inode, iblock, bh_result, create);
129 up_read(&oi->ip_alloc_sem); 129 up_read(&oi->ip_alloc_sem);
130 130
131 return ret; 131 return ret;
132 } 132 }
133 133
134 int ocfs2_get_block(struct inode *inode, secto 134 int ocfs2_get_block(struct inode *inode, sector_t iblock,
135 struct buffer_head *bh_res 135 struct buffer_head *bh_result, int create)
136 { 136 {
137 int err = 0; 137 int err = 0;
138 unsigned int ext_flags; 138 unsigned int ext_flags;
139 u64 max_blocks = bh_result->b_size >> 139 u64 max_blocks = bh_result->b_size >> inode->i_blkbits;
140 u64 p_blkno, count, past_eof; 140 u64 p_blkno, count, past_eof;
141 struct ocfs2_super *osb = OCFS2_SB(ino 141 struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
142 142
143 trace_ocfs2_get_block((unsigned long l 143 trace_ocfs2_get_block((unsigned long long)OCFS2_I(inode)->ip_blkno,
144 (unsigned long l 144 (unsigned long long)iblock, bh_result, create);
145 145
146 if (OCFS2_I(inode)->ip_flags & OCFS2_I 146 if (OCFS2_I(inode)->ip_flags & OCFS2_INODE_SYSTEM_FILE)
147 mlog(ML_NOTICE, "get_block on 147 mlog(ML_NOTICE, "get_block on system inode 0x%p (%lu)\n",
148 inode, inode->i_ino); 148 inode, inode->i_ino);
149 149
150 if (S_ISLNK(inode->i_mode)) { 150 if (S_ISLNK(inode->i_mode)) {
151 /* this always does I/O for so 151 /* this always does I/O for some reason. */
152 err = ocfs2_symlink_get_block( 152 err = ocfs2_symlink_get_block(inode, iblock, bh_result, create);
153 goto bail; 153 goto bail;
154 } 154 }
155 155
156 err = ocfs2_extent_map_get_blocks(inod 156 err = ocfs2_extent_map_get_blocks(inode, iblock, &p_blkno, &count,
157 &ext 157 &ext_flags);
158 if (err) { 158 if (err) {
159 mlog(ML_ERROR, "get_blocks() f !! 159 mlog(ML_ERROR, "Error %d from get_blocks(0x%p, %llu, 1, "
160 "block: %llu\n", inode, ( !! 160 "%llu, NULL)\n", err, inode, (unsigned long long)iblock,
>> 161 (unsigned long long)p_blkno);
161 goto bail; 162 goto bail;
162 } 163 }
163 164
164 if (max_blocks < count) 165 if (max_blocks < count)
165 count = max_blocks; 166 count = max_blocks;
166 167
167 /* 168 /*
168 * ocfs2 never allocates in this funct 169 * ocfs2 never allocates in this function - the only time we
169 * need to use BH_New is when we're ex 170 * need to use BH_New is when we're extending i_size on a file
170 * system which doesn't support holes, 171 * system which doesn't support holes, in which case BH_New
171 * allows __block_write_begin() to zer 172 * allows __block_write_begin() to zero.
172 * 173 *
173 * If we see this on a sparse file sys 174 * If we see this on a sparse file system, then a truncate has
174 * raced us and removed the cluster. I 175 * raced us and removed the cluster. In this case, we clear
175 * the buffers dirty and uptodate bits 176 * the buffers dirty and uptodate bits and let the buffer code
176 * ignore it as a hole. 177 * ignore it as a hole.
177 */ 178 */
178 if (create && p_blkno == 0 && ocfs2_sp 179 if (create && p_blkno == 0 && ocfs2_sparse_alloc(osb)) {
179 clear_buffer_dirty(bh_result); 180 clear_buffer_dirty(bh_result);
180 clear_buffer_uptodate(bh_resul 181 clear_buffer_uptodate(bh_result);
181 goto bail; 182 goto bail;
182 } 183 }
183 184
184 /* Treat the unwritten extent as a hol 185 /* Treat the unwritten extent as a hole for zeroing purposes. */
185 if (p_blkno && !(ext_flags & OCFS2_EXT 186 if (p_blkno && !(ext_flags & OCFS2_EXT_UNWRITTEN))
186 map_bh(bh_result, inode->i_sb, 187 map_bh(bh_result, inode->i_sb, p_blkno);
187 188
188 bh_result->b_size = count << inode->i_ 189 bh_result->b_size = count << inode->i_blkbits;
189 190
190 if (!ocfs2_sparse_alloc(osb)) { 191 if (!ocfs2_sparse_alloc(osb)) {
191 if (p_blkno == 0) { 192 if (p_blkno == 0) {
192 err = -EIO; 193 err = -EIO;
193 mlog(ML_ERROR, 194 mlog(ML_ERROR,
194 "iblock = %llu p_ 195 "iblock = %llu p_blkno = %llu blkno=(%llu)\n",
195 (unsigned long lo 196 (unsigned long long)iblock,
196 (unsigned long lo 197 (unsigned long long)p_blkno,
197 (unsigned long lo 198 (unsigned long long)OCFS2_I(inode)->ip_blkno);
198 mlog(ML_ERROR, "Size % 199 mlog(ML_ERROR, "Size %llu, clusters %u\n", (unsigned long long)i_size_read(inode), OCFS2_I(inode)->ip_clusters);
199 dump_stack(); 200 dump_stack();
200 goto bail; 201 goto bail;
201 } 202 }
202 } 203 }
203 204
204 past_eof = ocfs2_blocks_for_bytes(inod 205 past_eof = ocfs2_blocks_for_bytes(inode->i_sb, i_size_read(inode));
205 206
206 trace_ocfs2_get_block_end((unsigned lo 207 trace_ocfs2_get_block_end((unsigned long long)OCFS2_I(inode)->ip_blkno,
207 (unsigned lo 208 (unsigned long long)past_eof);
208 if (create && (iblock >= past_eof)) 209 if (create && (iblock >= past_eof))
209 set_buffer_new(bh_result); 210 set_buffer_new(bh_result);
210 211
211 bail: 212 bail:
212 if (err < 0) 213 if (err < 0)
213 err = -EIO; 214 err = -EIO;
214 215
215 return err; 216 return err;
216 } 217 }
217 218
218 int ocfs2_read_inline_data(struct inode *inode 219 int ocfs2_read_inline_data(struct inode *inode, struct page *page,
219 struct buffer_head 220 struct buffer_head *di_bh)
220 { 221 {
221 void *kaddr; 222 void *kaddr;
222 loff_t size; 223 loff_t size;
223 struct ocfs2_dinode *di = (struct ocfs 224 struct ocfs2_dinode *di = (struct ocfs2_dinode *)di_bh->b_data;
224 225
225 if (!(le16_to_cpu(di->i_dyn_features) 226 if (!(le16_to_cpu(di->i_dyn_features) & OCFS2_INLINE_DATA_FL)) {
226 ocfs2_error(inode->i_sb, "Inod 227 ocfs2_error(inode->i_sb, "Inode %llu lost inline data flag\n",
227 (unsigned long lon 228 (unsigned long long)OCFS2_I(inode)->ip_blkno);
228 return -EROFS; 229 return -EROFS;
229 } 230 }
230 231
231 size = i_size_read(inode); 232 size = i_size_read(inode);
232 233
233 if (size > PAGE_SIZE || 234 if (size > PAGE_SIZE ||
234 size > ocfs2_max_inline_data_with_ 235 size > ocfs2_max_inline_data_with_xattr(inode->i_sb, di)) {
235 ocfs2_error(inode->i_sb, 236 ocfs2_error(inode->i_sb,
236 "Inode %llu has wi 237 "Inode %llu has with inline data has bad size: %Lu\n",
237 (unsigned long lon 238 (unsigned long long)OCFS2_I(inode)->ip_blkno,
238 (unsigned long lon 239 (unsigned long long)size);
239 return -EROFS; 240 return -EROFS;
240 } 241 }
241 242
242 kaddr = kmap_atomic(page); 243 kaddr = kmap_atomic(page);
243 if (size) 244 if (size)
244 memcpy(kaddr, di->id2.i_data.i 245 memcpy(kaddr, di->id2.i_data.id_data, size);
245 /* Clear the remaining part of the pag 246 /* Clear the remaining part of the page */
246 memset(kaddr + size, 0, PAGE_SIZE - si 247 memset(kaddr + size, 0, PAGE_SIZE - size);
247 flush_dcache_page(page); 248 flush_dcache_page(page);
248 kunmap_atomic(kaddr); 249 kunmap_atomic(kaddr);
249 250
250 SetPageUptodate(page); 251 SetPageUptodate(page);
251 252
252 return 0; 253 return 0;
253 } 254 }
254 255
255 static int ocfs2_readpage_inline(struct inode 256 static int ocfs2_readpage_inline(struct inode *inode, struct page *page)
256 { 257 {
257 int ret; 258 int ret;
258 struct buffer_head *di_bh = NULL; 259 struct buffer_head *di_bh = NULL;
259 260
260 BUG_ON(!PageLocked(page)); 261 BUG_ON(!PageLocked(page));
261 BUG_ON(!(OCFS2_I(inode)->ip_dyn_featur 262 BUG_ON(!(OCFS2_I(inode)->ip_dyn_features & OCFS2_INLINE_DATA_FL));
262 263
263 ret = ocfs2_read_inode_block(inode, &d 264 ret = ocfs2_read_inode_block(inode, &di_bh);
264 if (ret) { 265 if (ret) {
265 mlog_errno(ret); 266 mlog_errno(ret);
266 goto out; 267 goto out;
267 } 268 }
268 269
269 ret = ocfs2_read_inline_data(inode, pa 270 ret = ocfs2_read_inline_data(inode, page, di_bh);
270 out: 271 out:
271 unlock_page(page); 272 unlock_page(page);
272 273
273 brelse(di_bh); 274 brelse(di_bh);
274 return ret; 275 return ret;
275 } 276 }
276 277
277 static int ocfs2_read_folio(struct file *file, 278 static int ocfs2_read_folio(struct file *file, struct folio *folio)
278 { 279 {
279 struct inode *inode = folio->mapping-> 280 struct inode *inode = folio->mapping->host;
280 struct ocfs2_inode_info *oi = OCFS2_I( 281 struct ocfs2_inode_info *oi = OCFS2_I(inode);
281 loff_t start = folio_pos(folio); 282 loff_t start = folio_pos(folio);
282 int ret, unlock = 1; 283 int ret, unlock = 1;
283 284
284 trace_ocfs2_readpage((unsigned long lo 285 trace_ocfs2_readpage((unsigned long long)oi->ip_blkno, folio->index);
285 286
286 ret = ocfs2_inode_lock_with_page(inode 287 ret = ocfs2_inode_lock_with_page(inode, NULL, 0, &folio->page);
287 if (ret != 0) { 288 if (ret != 0) {
288 if (ret == AOP_TRUNCATED_PAGE) 289 if (ret == AOP_TRUNCATED_PAGE)
289 unlock = 0; 290 unlock = 0;
290 mlog_errno(ret); 291 mlog_errno(ret);
291 goto out; 292 goto out;
292 } 293 }
293 294
294 if (down_read_trylock(&oi->ip_alloc_se 295 if (down_read_trylock(&oi->ip_alloc_sem) == 0) {
295 /* 296 /*
296 * Unlock the folio and cycle 297 * Unlock the folio and cycle ip_alloc_sem so that we don't
297 * busyloop waiting for ip_all 298 * busyloop waiting for ip_alloc_sem to unlock
298 */ 299 */
299 ret = AOP_TRUNCATED_PAGE; 300 ret = AOP_TRUNCATED_PAGE;
300 folio_unlock(folio); 301 folio_unlock(folio);
301 unlock = 0; 302 unlock = 0;
302 down_read(&oi->ip_alloc_sem); 303 down_read(&oi->ip_alloc_sem);
303 up_read(&oi->ip_alloc_sem); 304 up_read(&oi->ip_alloc_sem);
304 goto out_inode_unlock; 305 goto out_inode_unlock;
305 } 306 }
306 307
307 /* 308 /*
308 * i_size might have just been updated 309 * i_size might have just been updated as we grabed the meta lock. We
309 * might now be discovering a truncate 310 * might now be discovering a truncate that hit on another node.
310 * block_read_full_folio->get_block fr 311 * block_read_full_folio->get_block freaks out if it is asked to read
311 * beyond the end of a file, so we che 312 * beyond the end of a file, so we check here. Callers
312 * (generic_file_read, vm_ops->fault) 313 * (generic_file_read, vm_ops->fault) are clever enough to check i_size
313 * and notice that the folio they just 314 * and notice that the folio they just read isn't needed.
314 * 315 *
315 * XXX sys_readahead() seems to get th 316 * XXX sys_readahead() seems to get that wrong?
316 */ 317 */
317 if (start >= i_size_read(inode)) { 318 if (start >= i_size_read(inode)) {
318 folio_zero_segment(folio, 0, f 319 folio_zero_segment(folio, 0, folio_size(folio));
319 folio_mark_uptodate(folio); 320 folio_mark_uptodate(folio);
320 ret = 0; 321 ret = 0;
321 goto out_alloc; 322 goto out_alloc;
322 } 323 }
323 324
324 if (oi->ip_dyn_features & OCFS2_INLINE 325 if (oi->ip_dyn_features & OCFS2_INLINE_DATA_FL)
325 ret = ocfs2_readpage_inline(in 326 ret = ocfs2_readpage_inline(inode, &folio->page);
326 else 327 else
327 ret = block_read_full_folio(fo 328 ret = block_read_full_folio(folio, ocfs2_get_block);
328 unlock = 0; 329 unlock = 0;
329 330
330 out_alloc: 331 out_alloc:
331 up_read(&oi->ip_alloc_sem); 332 up_read(&oi->ip_alloc_sem);
332 out_inode_unlock: 333 out_inode_unlock:
333 ocfs2_inode_unlock(inode, 0); 334 ocfs2_inode_unlock(inode, 0);
334 out: 335 out:
335 if (unlock) 336 if (unlock)
336 folio_unlock(folio); 337 folio_unlock(folio);
337 return ret; 338 return ret;
338 } 339 }
339 340
340 /* 341 /*
341 * This is used only for read-ahead. Failures 342 * This is used only for read-ahead. Failures or difficult to handle
342 * situations are safe to ignore. 343 * situations are safe to ignore.
343 * 344 *
344 * Right now, we don't bother with BH_Boundary 345 * Right now, we don't bother with BH_Boundary - in-inode extent lists
345 * are quite large (243 extents on 4k blocks), 346 * are quite large (243 extents on 4k blocks), so most inodes don't
346 * grow out to a tree. If need be, detecting b 347 * grow out to a tree. If need be, detecting boundary extents could
347 * trivially be added in a future version of o 348 * trivially be added in a future version of ocfs2_get_block().
348 */ 349 */
349 static void ocfs2_readahead(struct readahead_c 350 static void ocfs2_readahead(struct readahead_control *rac)
350 { 351 {
351 int ret; 352 int ret;
352 struct inode *inode = rac->mapping->ho 353 struct inode *inode = rac->mapping->host;
353 struct ocfs2_inode_info *oi = OCFS2_I( 354 struct ocfs2_inode_info *oi = OCFS2_I(inode);
354 355
355 /* 356 /*
356 * Use the nonblocking flag for the dl 357 * Use the nonblocking flag for the dlm code to avoid page
357 * lock inversion, but don't bother wi 358 * lock inversion, but don't bother with retrying.
358 */ 359 */
359 ret = ocfs2_inode_lock_full(inode, NUL 360 ret = ocfs2_inode_lock_full(inode, NULL, 0, OCFS2_LOCK_NONBLOCK);
360 if (ret) 361 if (ret)
361 return; 362 return;
362 363
363 if (down_read_trylock(&oi->ip_alloc_se 364 if (down_read_trylock(&oi->ip_alloc_sem) == 0)
364 goto out_unlock; 365 goto out_unlock;
365 366
366 /* 367 /*
367 * Don't bother with inline-data. Ther 368 * Don't bother with inline-data. There isn't anything
368 * to read-ahead in that case anyway.. 369 * to read-ahead in that case anyway...
369 */ 370 */
370 if (oi->ip_dyn_features & OCFS2_INLINE 371 if (oi->ip_dyn_features & OCFS2_INLINE_DATA_FL)
371 goto out_up; 372 goto out_up;
372 373
373 /* 374 /*
374 * Check whether a remote node truncat 375 * Check whether a remote node truncated this file - we just
375 * drop out in that case as it's not w 376 * drop out in that case as it's not worth handling here.
376 */ 377 */
377 if (readahead_pos(rac) >= i_size_read( 378 if (readahead_pos(rac) >= i_size_read(inode))
378 goto out_up; 379 goto out_up;
379 380
380 mpage_readahead(rac, ocfs2_get_block); 381 mpage_readahead(rac, ocfs2_get_block);
381 382
382 out_up: 383 out_up:
383 up_read(&oi->ip_alloc_sem); 384 up_read(&oi->ip_alloc_sem);
384 out_unlock: 385 out_unlock:
385 ocfs2_inode_unlock(inode, 0); 386 ocfs2_inode_unlock(inode, 0);
386 } 387 }
387 388
388 /* Note: Because we don't support holes, our a 389 /* Note: Because we don't support holes, our allocation has
389 * already happened (allocation writes zeros t 390 * already happened (allocation writes zeros to the file data)
390 * so we don't have to worry about ordered wri 391 * so we don't have to worry about ordered writes in
391 * ocfs2_writepages. 392 * ocfs2_writepages.
392 * 393 *
393 * ->writepages is called during the process o 394 * ->writepages is called during the process of invalidating the page cache
394 * during blocked lock processing. It can't b 395 * during blocked lock processing. It can't block on any cluster locks
395 * to during block mapping. It's relying on t 396 * to during block mapping. It's relying on the fact that the block
396 * mapping can't have disappeared under the di 397 * mapping can't have disappeared under the dirty pages that it is
397 * being asked to write back. 398 * being asked to write back.
398 */ 399 */
399 static int ocfs2_writepages(struct address_spa 400 static int ocfs2_writepages(struct address_space *mapping,
400 struct writeback_control *wbc) 401 struct writeback_control *wbc)
401 { 402 {
402 return mpage_writepages(mapping, wbc, 403 return mpage_writepages(mapping, wbc, ocfs2_get_block);
403 } 404 }
404 405
405 /* Taken from ext3. We don't necessarily need 406 /* Taken from ext3. We don't necessarily need the full blown
406 * functionality yet, but IMHO it's better to 407 * functionality yet, but IMHO it's better to cut and paste the whole
407 * thing so we can avoid introducing our own b 408 * thing so we can avoid introducing our own bugs (and easily pick up
408 * their fixes when they happen) --Mark */ 409 * their fixes when they happen) --Mark */
409 int walk_page_buffers( handle_t *handle, 410 int walk_page_buffers( handle_t *handle,
410 struct buffer_head *he 411 struct buffer_head *head,
411 unsigned from, 412 unsigned from,
412 unsigned to, 413 unsigned to,
413 int *partial, 414 int *partial,
414 int (*fn)( handle 415 int (*fn)( handle_t *handle,
415 struct 416 struct buffer_head *bh))
416 { 417 {
417 struct buffer_head *bh; 418 struct buffer_head *bh;
418 unsigned block_start, block_end; 419 unsigned block_start, block_end;
419 unsigned blocksize = head->b_size; 420 unsigned blocksize = head->b_size;
420 int err, ret = 0; 421 int err, ret = 0;
421 struct buffer_head *next; 422 struct buffer_head *next;
422 423
423 for ( bh = head, block_start = 0; 424 for ( bh = head, block_start = 0;
424 ret == 0 && (bh != head || !bl 425 ret == 0 && (bh != head || !block_start);
425 block_start = block_end, bh = 426 block_start = block_end, bh = next)
426 { 427 {
427 next = bh->b_this_page; 428 next = bh->b_this_page;
428 block_end = block_start + bloc 429 block_end = block_start + blocksize;
429 if (block_end <= from || block 430 if (block_end <= from || block_start >= to) {
430 if (partial && !buffer 431 if (partial && !buffer_uptodate(bh))
431 *partial = 1; 432 *partial = 1;
432 continue; 433 continue;
433 } 434 }
434 err = (*fn)(handle, bh); 435 err = (*fn)(handle, bh);
435 if (!ret) 436 if (!ret)
436 ret = err; 437 ret = err;
437 } 438 }
438 return ret; 439 return ret;
439 } 440 }
440 441
441 static sector_t ocfs2_bmap(struct address_spac 442 static sector_t ocfs2_bmap(struct address_space *mapping, sector_t block)
442 { 443 {
443 sector_t status; 444 sector_t status;
444 u64 p_blkno = 0; 445 u64 p_blkno = 0;
445 int err = 0; 446 int err = 0;
446 struct inode *inode = mapping->host; 447 struct inode *inode = mapping->host;
447 448
448 trace_ocfs2_bmap((unsigned long long)O 449 trace_ocfs2_bmap((unsigned long long)OCFS2_I(inode)->ip_blkno,
449 (unsigned long long)b 450 (unsigned long long)block);
450 451
451 /* 452 /*
452 * The swap code (ab-)uses ->bmap to g 453 * The swap code (ab-)uses ->bmap to get a block mapping and then
453 * bypasseѕ the file system for actua 454 * bypasseѕ the file system for actual I/O. We really can't allow
454 * that on refcounted inodes, so we ha 455 * that on refcounted inodes, so we have to skip out here. And yes,
455 * 0 is the magic code for a bmap erro 456 * 0 is the magic code for a bmap error..
456 */ 457 */
457 if (ocfs2_is_refcount_inode(inode)) 458 if (ocfs2_is_refcount_inode(inode))
458 return 0; 459 return 0;
459 460
460 /* We don't need to lock journal syste 461 /* We don't need to lock journal system files, since they aren't
461 * accessed concurrently from multiple 462 * accessed concurrently from multiple nodes.
462 */ 463 */
463 if (!INODE_JOURNAL(inode)) { 464 if (!INODE_JOURNAL(inode)) {
464 err = ocfs2_inode_lock(inode, 465 err = ocfs2_inode_lock(inode, NULL, 0);
465 if (err) { 466 if (err) {
466 if (err != -ENOENT) 467 if (err != -ENOENT)
467 mlog_errno(err 468 mlog_errno(err);
468 goto bail; 469 goto bail;
469 } 470 }
470 down_read(&OCFS2_I(inode)->ip_ 471 down_read(&OCFS2_I(inode)->ip_alloc_sem);
471 } 472 }
472 473
473 if (!(OCFS2_I(inode)->ip_dyn_features 474 if (!(OCFS2_I(inode)->ip_dyn_features & OCFS2_INLINE_DATA_FL))
474 err = ocfs2_extent_map_get_blo 475 err = ocfs2_extent_map_get_blocks(inode, block, &p_blkno, NULL,
475 476 NULL);
476 477
477 if (!INODE_JOURNAL(inode)) { 478 if (!INODE_JOURNAL(inode)) {
478 up_read(&OCFS2_I(inode)->ip_al 479 up_read(&OCFS2_I(inode)->ip_alloc_sem);
479 ocfs2_inode_unlock(inode, 0); 480 ocfs2_inode_unlock(inode, 0);
480 } 481 }
481 482
482 if (err) { 483 if (err) {
483 mlog(ML_ERROR, "get_blocks() f 484 mlog(ML_ERROR, "get_blocks() failed, block = %llu\n",
484 (unsigned long long)block 485 (unsigned long long)block);
485 mlog_errno(err); 486 mlog_errno(err);
486 goto bail; 487 goto bail;
487 } 488 }
488 489
489 bail: 490 bail:
490 status = err ? 0 : p_blkno; 491 status = err ? 0 : p_blkno;
491 492
492 return status; 493 return status;
493 } 494 }
494 495
495 static bool ocfs2_release_folio(struct folio * 496 static bool ocfs2_release_folio(struct folio *folio, gfp_t wait)
496 { 497 {
497 if (!folio_buffers(folio)) 498 if (!folio_buffers(folio))
498 return false; 499 return false;
499 return try_to_free_buffers(folio); 500 return try_to_free_buffers(folio);
500 } 501 }
501 502
502 static void ocfs2_figure_cluster_boundaries(st 503 static void ocfs2_figure_cluster_boundaries(struct ocfs2_super *osb,
503 u3 504 u32 cpos,
504 un 505 unsigned int *start,
505 un 506 unsigned int *end)
506 { 507 {
507 unsigned int cluster_start = 0, cluste 508 unsigned int cluster_start = 0, cluster_end = PAGE_SIZE;
508 509
509 if (unlikely(PAGE_SHIFT > osb->s_clust 510 if (unlikely(PAGE_SHIFT > osb->s_clustersize_bits)) {
510 unsigned int cpp; 511 unsigned int cpp;
511 512
512 cpp = 1 << (PAGE_SHIFT - osb-> 513 cpp = 1 << (PAGE_SHIFT - osb->s_clustersize_bits);
513 514
514 cluster_start = cpos % cpp; 515 cluster_start = cpos % cpp;
515 cluster_start = cluster_start 516 cluster_start = cluster_start << osb->s_clustersize_bits;
516 517
517 cluster_end = cluster_start + 518 cluster_end = cluster_start + osb->s_clustersize;
518 } 519 }
519 520
520 BUG_ON(cluster_start > PAGE_SIZE); 521 BUG_ON(cluster_start > PAGE_SIZE);
521 BUG_ON(cluster_end > PAGE_SIZE); 522 BUG_ON(cluster_end > PAGE_SIZE);
522 523
523 if (start) 524 if (start)
524 *start = cluster_start; 525 *start = cluster_start;
525 if (end) 526 if (end)
526 *end = cluster_end; 527 *end = cluster_end;
527 } 528 }
528 529
529 /* 530 /*
530 * 'from' and 'to' are the region in the page 531 * 'from' and 'to' are the region in the page to avoid zeroing.
531 * 532 *
532 * If pagesize > clustersize, this function wi 533 * If pagesize > clustersize, this function will avoid zeroing outside
533 * of the cluster boundary. 534 * of the cluster boundary.
534 * 535 *
535 * from == to == 0 is code for "zero the entir 536 * from == to == 0 is code for "zero the entire cluster region"
536 */ 537 */
537 static void ocfs2_clear_page_regions(struct pa 538 static void ocfs2_clear_page_regions(struct page *page,
538 struct oc 539 struct ocfs2_super *osb, u32 cpos,
539 unsigned 540 unsigned from, unsigned to)
540 { 541 {
541 void *kaddr; 542 void *kaddr;
542 unsigned int cluster_start, cluster_en 543 unsigned int cluster_start, cluster_end;
543 544
544 ocfs2_figure_cluster_boundaries(osb, c 545 ocfs2_figure_cluster_boundaries(osb, cpos, &cluster_start, &cluster_end);
545 546
546 kaddr = kmap_atomic(page); 547 kaddr = kmap_atomic(page);
547 548
548 if (from || to) { 549 if (from || to) {
549 if (from > cluster_start) 550 if (from > cluster_start)
550 memset(kaddr + cluster 551 memset(kaddr + cluster_start, 0, from - cluster_start);
551 if (to < cluster_end) 552 if (to < cluster_end)
552 memset(kaddr + to, 0, 553 memset(kaddr + to, 0, cluster_end - to);
553 } else { 554 } else {
554 memset(kaddr + cluster_start, 555 memset(kaddr + cluster_start, 0, cluster_end - cluster_start);
555 } 556 }
556 557
557 kunmap_atomic(kaddr); 558 kunmap_atomic(kaddr);
558 } 559 }
559 560
560 /* 561 /*
561 * Nonsparse file systems fully allocate befor 562 * Nonsparse file systems fully allocate before we get to the write
562 * code. This prevents ocfs2_write() from tagg 563 * code. This prevents ocfs2_write() from tagging the write as an
563 * allocating one, which means ocfs2_map_page_ 564 * allocating one, which means ocfs2_map_page_blocks() might try to
564 * read-in the blocks at the tail of our file. 565 * read-in the blocks at the tail of our file. Avoid reading them by
565 * testing i_size against each block offset. 566 * testing i_size against each block offset.
566 */ 567 */
567 static int ocfs2_should_read_blk(struct inode 568 static int ocfs2_should_read_blk(struct inode *inode, struct folio *folio,
568 unsigned int 569 unsigned int block_start)
569 { 570 {
570 u64 offset = folio_pos(folio) + block_ 571 u64 offset = folio_pos(folio) + block_start;
571 572
572 if (ocfs2_sparse_alloc(OCFS2_SB(inode- 573 if (ocfs2_sparse_alloc(OCFS2_SB(inode->i_sb)))
573 return 1; 574 return 1;
574 575
575 if (i_size_read(inode) > offset) 576 if (i_size_read(inode) > offset)
576 return 1; 577 return 1;
577 578
578 return 0; 579 return 0;
579 } 580 }
580 581
581 /* 582 /*
582 * Some of this taken from __block_write_begin 583 * Some of this taken from __block_write_begin(). We already have our
583 * mapping by now though, and the entire write 584 * mapping by now though, and the entire write will be allocating or
584 * it won't, so not much need to use BH_New. 585 * it won't, so not much need to use BH_New.
585 * 586 *
586 * This will also skip zeroing, which is handl 587 * This will also skip zeroing, which is handled externally.
587 */ 588 */
588 int ocfs2_map_page_blocks(struct page *page, u 589 int ocfs2_map_page_blocks(struct page *page, u64 *p_blkno,
589 struct inode *inode, 590 struct inode *inode, unsigned int from,
590 unsigned int to, int 591 unsigned int to, int new)
591 { 592 {
592 struct folio *folio = page_folio(page) 593 struct folio *folio = page_folio(page);
593 int ret = 0; 594 int ret = 0;
594 struct buffer_head *head, *bh, *wait[2 595 struct buffer_head *head, *bh, *wait[2], **wait_bh = wait;
595 unsigned int block_end, block_start; 596 unsigned int block_end, block_start;
596 unsigned int bsize = i_blocksize(inode 597 unsigned int bsize = i_blocksize(inode);
597 598
598 head = folio_buffers(folio); 599 head = folio_buffers(folio);
599 if (!head) 600 if (!head)
600 head = create_empty_buffers(fo 601 head = create_empty_buffers(folio, bsize, 0);
601 602
602 for (bh = head, block_start = 0; bh != 603 for (bh = head, block_start = 0; bh != head || !block_start;
603 bh = bh->b_this_page, block_start 604 bh = bh->b_this_page, block_start += bsize) {
604 block_end = block_start + bsiz 605 block_end = block_start + bsize;
605 606
606 clear_buffer_new(bh); 607 clear_buffer_new(bh);
607 608
608 /* 609 /*
609 * Ignore blocks outside of ou 610 * Ignore blocks outside of our i/o range -
610 * they may belong to unalloca 611 * they may belong to unallocated clusters.
611 */ 612 */
612 if (block_start >= to || block 613 if (block_start >= to || block_end <= from) {
613 if (folio_test_uptodat 614 if (folio_test_uptodate(folio))
614 set_buffer_upt 615 set_buffer_uptodate(bh);
615 continue; 616 continue;
616 } 617 }
617 618
618 /* 619 /*
619 * For an allocating write wit 620 * For an allocating write with cluster size >= page
620 * size, we always write the e 621 * size, we always write the entire page.
621 */ 622 */
622 if (new) 623 if (new)
623 set_buffer_new(bh); 624 set_buffer_new(bh);
624 625
625 if (!buffer_mapped(bh)) { 626 if (!buffer_mapped(bh)) {
626 map_bh(bh, inode->i_sb 627 map_bh(bh, inode->i_sb, *p_blkno);
627 clean_bdev_bh_alias(bh 628 clean_bdev_bh_alias(bh);
628 } 629 }
629 630
630 if (folio_test_uptodate(folio) 631 if (folio_test_uptodate(folio)) {
631 set_buffer_uptodate(bh 632 set_buffer_uptodate(bh);
632 } else if (!buffer_uptodate(bh 633 } else if (!buffer_uptodate(bh) && !buffer_delay(bh) &&
633 !buffer_new(bh) && 634 !buffer_new(bh) &&
634 ocfs2_should_read_b 635 ocfs2_should_read_blk(inode, folio, block_start) &&
635 (block_start < from 636 (block_start < from || block_end > to)) {
636 bh_read_nowait(bh, 0); 637 bh_read_nowait(bh, 0);
637 *wait_bh++=bh; 638 *wait_bh++=bh;
638 } 639 }
639 640
640 *p_blkno = *p_blkno + 1; 641 *p_blkno = *p_blkno + 1;
641 } 642 }
642 643
643 /* 644 /*
644 * If we issued read requests - let th 645 * If we issued read requests - let them complete.
645 */ 646 */
646 while(wait_bh > wait) { 647 while(wait_bh > wait) {
647 wait_on_buffer(*--wait_bh); 648 wait_on_buffer(*--wait_bh);
648 if (!buffer_uptodate(*wait_bh) 649 if (!buffer_uptodate(*wait_bh))
649 ret = -EIO; 650 ret = -EIO;
650 } 651 }
651 652
652 if (ret == 0 || !new) 653 if (ret == 0 || !new)
653 return ret; 654 return ret;
654 655
655 /* 656 /*
656 * If we get -EIO above, zero out any 657 * If we get -EIO above, zero out any newly allocated blocks
657 * to avoid exposing stale data. 658 * to avoid exposing stale data.
658 */ 659 */
659 bh = head; 660 bh = head;
660 block_start = 0; 661 block_start = 0;
661 do { 662 do {
662 block_end = block_start + bsiz 663 block_end = block_start + bsize;
663 if (block_end <= from) 664 if (block_end <= from)
664 goto next_bh; 665 goto next_bh;
665 if (block_start >= to) 666 if (block_start >= to)
666 break; 667 break;
667 668
668 folio_zero_range(folio, block_ 669 folio_zero_range(folio, block_start, bh->b_size);
669 set_buffer_uptodate(bh); 670 set_buffer_uptodate(bh);
670 mark_buffer_dirty(bh); 671 mark_buffer_dirty(bh);
671 672
672 next_bh: 673 next_bh:
673 block_start = block_end; 674 block_start = block_end;
674 bh = bh->b_this_page; 675 bh = bh->b_this_page;
675 } while (bh != head); 676 } while (bh != head);
676 677
677 return ret; 678 return ret;
678 } 679 }
679 680
680 #if (PAGE_SIZE >= OCFS2_MAX_CLUSTERSIZE) 681 #if (PAGE_SIZE >= OCFS2_MAX_CLUSTERSIZE)
681 #define OCFS2_MAX_CTXT_PAGES 1 682 #define OCFS2_MAX_CTXT_PAGES 1
682 #else 683 #else
683 #define OCFS2_MAX_CTXT_PAGES (OCFS2_MAX_CLU 684 #define OCFS2_MAX_CTXT_PAGES (OCFS2_MAX_CLUSTERSIZE / PAGE_SIZE)
684 #endif 685 #endif
685 686
686 #define OCFS2_MAX_CLUSTERS_PER_PAGE (PAGE_ 687 #define OCFS2_MAX_CLUSTERS_PER_PAGE (PAGE_SIZE / OCFS2_MIN_CLUSTERSIZE)
687 688
688 struct ocfs2_unwritten_extent { 689 struct ocfs2_unwritten_extent {
689 struct list_head ue_node; 690 struct list_head ue_node;
690 struct list_head ue_ip_node; 691 struct list_head ue_ip_node;
691 u32 ue_cpos; 692 u32 ue_cpos;
692 u32 ue_phys; 693 u32 ue_phys;
693 }; 694 };
694 695
695 /* 696 /*
696 * Describe the state of a single cluster to b 697 * Describe the state of a single cluster to be written to.
697 */ 698 */
698 struct ocfs2_write_cluster_desc { 699 struct ocfs2_write_cluster_desc {
699 u32 c_cpos; 700 u32 c_cpos;
700 u32 c_phys; 701 u32 c_phys;
701 /* 702 /*
702 * Give this a unique field because c_ 703 * Give this a unique field because c_phys eventually gets
703 * filled. 704 * filled.
704 */ 705 */
705 unsigned c_new; 706 unsigned c_new;
706 unsigned c_clear_unwritten; 707 unsigned c_clear_unwritten;
707 unsigned c_needs_zero; 708 unsigned c_needs_zero;
708 }; 709 };
709 710
710 struct ocfs2_write_ctxt { 711 struct ocfs2_write_ctxt {
711 /* Logical cluster position / len of w 712 /* Logical cluster position / len of write */
712 u32 w_cpos 713 u32 w_cpos;
713 u32 w_clen 714 u32 w_clen;
714 715
715 /* First cluster allocated in a nonspa 716 /* First cluster allocated in a nonsparse extend */
716 u32 w_firs 717 u32 w_first_new_cpos;
717 718
718 /* Type of caller. Must be one of buff 719 /* Type of caller. Must be one of buffer, mmap, direct. */
719 ocfs2_write_type_t w_type 720 ocfs2_write_type_t w_type;
720 721
721 struct ocfs2_write_cluster_desc w_desc 722 struct ocfs2_write_cluster_desc w_desc[OCFS2_MAX_CLUSTERS_PER_PAGE];
722 723
723 /* 724 /*
724 * This is true if page_size > cluster 725 * This is true if page_size > cluster_size.
725 * 726 *
726 * It triggers a set of special cases 727 * It triggers a set of special cases during write which might
727 * have to deal with allocating writes 728 * have to deal with allocating writes to partial pages.
728 */ 729 */
729 unsigned int w_larg 730 unsigned int w_large_pages;
730 731
731 /* 732 /*
732 * Pages involved in this write. 733 * Pages involved in this write.
733 * 734 *
734 * w_target_page is the page being wri 735 * w_target_page is the page being written to by the user.
735 * 736 *
736 * w_pages is an array of pages which 737 * w_pages is an array of pages which always contains
737 * w_target_page, and in the case of a 738 * w_target_page, and in the case of an allocating write with
738 * page_size < cluster size, it will c 739 * page_size < cluster size, it will contain zero'd and mapped
739 * pages adjacent to w_target_page whi 740 * pages adjacent to w_target_page which need to be written
740 * out in so that future reads from th 741 * out in so that future reads from that region will get
741 * zero's. 742 * zero's.
742 */ 743 */
743 unsigned int w_num_ 744 unsigned int w_num_pages;
744 struct page *w_pag 745 struct page *w_pages[OCFS2_MAX_CTXT_PAGES];
745 struct page *w_tar 746 struct page *w_target_page;
746 747
747 /* 748 /*
748 * w_target_locked is used for page_mk 749 * w_target_locked is used for page_mkwrite path indicating no unlocking
749 * against w_target_page in ocfs2_writ 750 * against w_target_page in ocfs2_write_end_nolock.
750 */ 751 */
751 unsigned int w_targ 752 unsigned int w_target_locked:1;
752 753
753 /* 754 /*
754 * ocfs2_write_end() uses this to know 755 * ocfs2_write_end() uses this to know what the real range to
755 * write in the target should be. 756 * write in the target should be.
756 */ 757 */
757 unsigned int w_targ 758 unsigned int w_target_from;
758 unsigned int w_targ 759 unsigned int w_target_to;
759 760
760 /* 761 /*
761 * We could use journal_current_handle 762 * We could use journal_current_handle() but this is cleaner,
762 * IMHO -Mark 763 * IMHO -Mark
763 */ 764 */
764 handle_t *w_han 765 handle_t *w_handle;
765 766
766 struct buffer_head *w_di_ 767 struct buffer_head *w_di_bh;
767 768
768 struct ocfs2_cached_dealloc_ctxt w_dea 769 struct ocfs2_cached_dealloc_ctxt w_dealloc;
769 770
770 struct list_head w_unwr 771 struct list_head w_unwritten_list;
771 unsigned int w_unwr 772 unsigned int w_unwritten_count;
772 }; 773 };
773 774
774 void ocfs2_unlock_and_free_pages(struct page * 775 void ocfs2_unlock_and_free_pages(struct page **pages, int num_pages)
775 { 776 {
776 int i; 777 int i;
777 778
778 for(i = 0; i < num_pages; i++) { 779 for(i = 0; i < num_pages; i++) {
779 if (pages[i]) { 780 if (pages[i]) {
780 unlock_page(pages[i]); 781 unlock_page(pages[i]);
781 mark_page_accessed(pag 782 mark_page_accessed(pages[i]);
782 put_page(pages[i]); 783 put_page(pages[i]);
783 } 784 }
784 } 785 }
785 } 786 }
786 787
787 static void ocfs2_unlock_pages(struct ocfs2_wr 788 static void ocfs2_unlock_pages(struct ocfs2_write_ctxt *wc)
788 { 789 {
789 int i; 790 int i;
790 791
791 /* 792 /*
792 * w_target_locked is only set to true 793 * w_target_locked is only set to true in the page_mkwrite() case.
793 * The intent is to allow us to lock t 794 * The intent is to allow us to lock the target page from write_begin()
794 * to write_end(). The caller must hol 795 * to write_end(). The caller must hold a ref on w_target_page.
795 */ 796 */
796 if (wc->w_target_locked) { 797 if (wc->w_target_locked) {
797 BUG_ON(!wc->w_target_page); 798 BUG_ON(!wc->w_target_page);
798 for (i = 0; i < wc->w_num_page 799 for (i = 0; i < wc->w_num_pages; i++) {
799 if (wc->w_target_page 800 if (wc->w_target_page == wc->w_pages[i]) {
800 wc->w_pages[i] 801 wc->w_pages[i] = NULL;
801 break; 802 break;
802 } 803 }
803 } 804 }
804 mark_page_accessed(wc->w_targe 805 mark_page_accessed(wc->w_target_page);
805 put_page(wc->w_target_page); 806 put_page(wc->w_target_page);
806 } 807 }
807 ocfs2_unlock_and_free_pages(wc->w_page 808 ocfs2_unlock_and_free_pages(wc->w_pages, wc->w_num_pages);
808 } 809 }
809 810
810 static void ocfs2_free_unwritten_list(struct i 811 static void ocfs2_free_unwritten_list(struct inode *inode,
811 struct list_h 812 struct list_head *head)
812 { 813 {
813 struct ocfs2_inode_info *oi = OCFS2_I( 814 struct ocfs2_inode_info *oi = OCFS2_I(inode);
814 struct ocfs2_unwritten_extent *ue = NU 815 struct ocfs2_unwritten_extent *ue = NULL, *tmp = NULL;
815 816
816 list_for_each_entry_safe(ue, tmp, head 817 list_for_each_entry_safe(ue, tmp, head, ue_node) {
817 list_del(&ue->ue_node); 818 list_del(&ue->ue_node);
818 spin_lock(&oi->ip_lock); 819 spin_lock(&oi->ip_lock);
819 list_del(&ue->ue_ip_node); 820 list_del(&ue->ue_ip_node);
820 spin_unlock(&oi->ip_lock); 821 spin_unlock(&oi->ip_lock);
821 kfree(ue); 822 kfree(ue);
822 } 823 }
823 } 824 }
824 825
825 static void ocfs2_free_write_ctxt(struct inode 826 static void ocfs2_free_write_ctxt(struct inode *inode,
826 struct ocfs2 827 struct ocfs2_write_ctxt *wc)
827 { 828 {
828 ocfs2_free_unwritten_list(inode, &wc-> 829 ocfs2_free_unwritten_list(inode, &wc->w_unwritten_list);
829 ocfs2_unlock_pages(wc); 830 ocfs2_unlock_pages(wc);
830 brelse(wc->w_di_bh); 831 brelse(wc->w_di_bh);
831 kfree(wc); 832 kfree(wc);
832 } 833 }
833 834
834 static int ocfs2_alloc_write_ctxt(struct ocfs2 835 static int ocfs2_alloc_write_ctxt(struct ocfs2_write_ctxt **wcp,
835 struct ocfs2 836 struct ocfs2_super *osb, loff_t pos,
836 unsigned len 837 unsigned len, ocfs2_write_type_t type,
837 struct buffe 838 struct buffer_head *di_bh)
838 { 839 {
839 u32 cend; 840 u32 cend;
840 struct ocfs2_write_ctxt *wc; 841 struct ocfs2_write_ctxt *wc;
841 842
842 wc = kzalloc(sizeof(struct ocfs2_write 843 wc = kzalloc(sizeof(struct ocfs2_write_ctxt), GFP_NOFS);
843 if (!wc) 844 if (!wc)
844 return -ENOMEM; 845 return -ENOMEM;
845 846
846 wc->w_cpos = pos >> osb->s_clustersize 847 wc->w_cpos = pos >> osb->s_clustersize_bits;
847 wc->w_first_new_cpos = UINT_MAX; 848 wc->w_first_new_cpos = UINT_MAX;
848 cend = (pos + len - 1) >> osb->s_clust 849 cend = (pos + len - 1) >> osb->s_clustersize_bits;
849 wc->w_clen = cend - wc->w_cpos + 1; 850 wc->w_clen = cend - wc->w_cpos + 1;
850 get_bh(di_bh); 851 get_bh(di_bh);
851 wc->w_di_bh = di_bh; 852 wc->w_di_bh = di_bh;
852 wc->w_type = type; 853 wc->w_type = type;
853 854
854 if (unlikely(PAGE_SHIFT > osb->s_clust 855 if (unlikely(PAGE_SHIFT > osb->s_clustersize_bits))
855 wc->w_large_pages = 1; 856 wc->w_large_pages = 1;
856 else 857 else
857 wc->w_large_pages = 0; 858 wc->w_large_pages = 0;
858 859
859 ocfs2_init_dealloc_ctxt(&wc->w_dealloc 860 ocfs2_init_dealloc_ctxt(&wc->w_dealloc);
860 INIT_LIST_HEAD(&wc->w_unwritten_list); 861 INIT_LIST_HEAD(&wc->w_unwritten_list);
861 862
862 *wcp = wc; 863 *wcp = wc;
863 864
864 return 0; 865 return 0;
865 } 866 }
866 867
867 /* 868 /*
868 * If a page has any new buffers, zero them ou 869 * If a page has any new buffers, zero them out here, and mark them uptodate
869 * and dirty so they'll be written out (in ord 870 * and dirty so they'll be written out (in order to prevent uninitialised
870 * block data from leaking). And clear the new 871 * block data from leaking). And clear the new bit.
871 */ 872 */
872 static void ocfs2_zero_new_buffers(struct page 873 static void ocfs2_zero_new_buffers(struct page *page, unsigned from, unsigned to)
873 { 874 {
874 unsigned int block_start, block_end; 875 unsigned int block_start, block_end;
875 struct buffer_head *head, *bh; 876 struct buffer_head *head, *bh;
876 877
877 BUG_ON(!PageLocked(page)); 878 BUG_ON(!PageLocked(page));
878 if (!page_has_buffers(page)) 879 if (!page_has_buffers(page))
879 return; 880 return;
880 881
881 bh = head = page_buffers(page); 882 bh = head = page_buffers(page);
882 block_start = 0; 883 block_start = 0;
883 do { 884 do {
884 block_end = block_start + bh-> 885 block_end = block_start + bh->b_size;
885 886
886 if (buffer_new(bh)) { 887 if (buffer_new(bh)) {
887 if (block_end > from & 888 if (block_end > from && block_start < to) {
888 if (!PageUptod 889 if (!PageUptodate(page)) {
889 unsign 890 unsigned start, end;
890 891
891 start 892 start = max(from, block_start);
892 end = 893 end = min(to, block_end);
893 894
894 zero_u 895 zero_user_segment(page, start, end);
895 set_bu 896 set_buffer_uptodate(bh);
896 } 897 }
897 898
898 clear_buffer_n 899 clear_buffer_new(bh);
899 mark_buffer_di 900 mark_buffer_dirty(bh);
900 } 901 }
901 } 902 }
902 903
903 block_start = block_end; 904 block_start = block_end;
904 bh = bh->b_this_page; 905 bh = bh->b_this_page;
905 } while (bh != head); 906 } while (bh != head);
906 } 907 }
907 908
908 /* 909 /*
909 * Only called when we have a failure during a 910 * Only called when we have a failure during allocating write to write
910 * zero's to the newly allocated region. 911 * zero's to the newly allocated region.
911 */ 912 */
912 static void ocfs2_write_failure(struct inode * 913 static void ocfs2_write_failure(struct inode *inode,
913 struct ocfs2_w 914 struct ocfs2_write_ctxt *wc,
914 loff_t user_po 915 loff_t user_pos, unsigned user_len)
915 { 916 {
916 int i; 917 int i;
917 unsigned from = user_pos & (PAGE_SIZE 918 unsigned from = user_pos & (PAGE_SIZE - 1),
918 to = user_pos + user_len; 919 to = user_pos + user_len;
919 struct page *tmppage; 920 struct page *tmppage;
920 921
921 if (wc->w_target_page) 922 if (wc->w_target_page)
922 ocfs2_zero_new_buffers(wc->w_t 923 ocfs2_zero_new_buffers(wc->w_target_page, from, to);
923 924
924 for(i = 0; i < wc->w_num_pages; i++) { 925 for(i = 0; i < wc->w_num_pages; i++) {
925 tmppage = wc->w_pages[i]; 926 tmppage = wc->w_pages[i];
926 927
927 if (tmppage && page_has_buffer 928 if (tmppage && page_has_buffers(tmppage)) {
928 if (ocfs2_should_order 929 if (ocfs2_should_order_data(inode))
929 ocfs2_jbd2_ino 930 ocfs2_jbd2_inode_add_write(wc->w_handle, inode,
930 931 user_pos, user_len);
931 932
932 block_commit_write(tmp 933 block_commit_write(tmppage, from, to);
933 } 934 }
934 } 935 }
935 } 936 }
936 937
937 static int ocfs2_prepare_page_for_write(struct 938 static int ocfs2_prepare_page_for_write(struct inode *inode, u64 *p_blkno,
938 struct 939 struct ocfs2_write_ctxt *wc,
939 struct 940 struct page *page, u32 cpos,
940 loff_t 941 loff_t user_pos, unsigned user_len,
941 int ne 942 int new)
942 { 943 {
943 int ret; 944 int ret;
944 unsigned int map_from = 0, map_to = 0; 945 unsigned int map_from = 0, map_to = 0;
945 unsigned int cluster_start, cluster_en 946 unsigned int cluster_start, cluster_end;
946 unsigned int user_data_from = 0, user_ 947 unsigned int user_data_from = 0, user_data_to = 0;
947 948
948 ocfs2_figure_cluster_boundaries(OCFS2_ 949 ocfs2_figure_cluster_boundaries(OCFS2_SB(inode->i_sb), cpos,
949 &clust 950 &cluster_start, &cluster_end);
950 951
951 /* treat the write as new if the a hol 952 /* treat the write as new if the a hole/lseek spanned across
952 * the page boundary. 953 * the page boundary.
953 */ 954 */
954 new = new | ((i_size_read(inode) <= pa 955 new = new | ((i_size_read(inode) <= page_offset(page)) &&
955 (page_offset(page) <= 956 (page_offset(page) <= user_pos));
956 957
957 if (page == wc->w_target_page) { 958 if (page == wc->w_target_page) {
958 map_from = user_pos & (PAGE_SI 959 map_from = user_pos & (PAGE_SIZE - 1);
959 map_to = map_from + user_len; 960 map_to = map_from + user_len;
960 961
961 if (new) 962 if (new)
962 ret = ocfs2_map_page_b 963 ret = ocfs2_map_page_blocks(page, p_blkno, inode,
963 964 cluster_start, cluster_end,
964 965 new);
965 else 966 else
966 ret = ocfs2_map_page_b 967 ret = ocfs2_map_page_blocks(page, p_blkno, inode,
967 968 map_from, map_to, new);
968 if (ret) { 969 if (ret) {
969 mlog_errno(ret); 970 mlog_errno(ret);
970 goto out; 971 goto out;
971 } 972 }
972 973
973 user_data_from = map_from; 974 user_data_from = map_from;
974 user_data_to = map_to; 975 user_data_to = map_to;
975 if (new) { 976 if (new) {
976 map_from = cluster_sta 977 map_from = cluster_start;
977 map_to = cluster_end; 978 map_to = cluster_end;
978 } 979 }
979 } else { 980 } else {
980 /* 981 /*
981 * If we haven't allocated the 982 * If we haven't allocated the new page yet, we
982 * shouldn't be writing it out 983 * shouldn't be writing it out without copying user
983 * data. This is likely a math 984 * data. This is likely a math error from the caller.
984 */ 985 */
985 BUG_ON(!new); 986 BUG_ON(!new);
986 987
987 map_from = cluster_start; 988 map_from = cluster_start;
988 map_to = cluster_end; 989 map_to = cluster_end;
989 990
990 ret = ocfs2_map_page_blocks(pa 991 ret = ocfs2_map_page_blocks(page, p_blkno, inode,
991 cl 992 cluster_start, cluster_end, new);
992 if (ret) { 993 if (ret) {
993 mlog_errno(ret); 994 mlog_errno(ret);
994 goto out; 995 goto out;
995 } 996 }
996 } 997 }
997 998
998 /* 999 /*
999 * Parts of newly allocated pages need 1000 * Parts of newly allocated pages need to be zero'd.
1000 * 1001 *
1001 * Above, we have also rewritten 'to' 1002 * Above, we have also rewritten 'to' and 'from' - as far as
1002 * the rest of the function is concer 1003 * the rest of the function is concerned, the entire cluster
1003 * range inside of a page needs to be 1004 * range inside of a page needs to be written.
1004 * 1005 *
1005 * We can skip this if the page is up 1006 * We can skip this if the page is up to date - it's already
1006 * been zero'd from being read in as 1007 * been zero'd from being read in as a hole.
1007 */ 1008 */
1008 if (new && !PageUptodate(page)) 1009 if (new && !PageUptodate(page))
1009 ocfs2_clear_page_regions(page 1010 ocfs2_clear_page_regions(page, OCFS2_SB(inode->i_sb),
1010 cpos 1011 cpos, user_data_from, user_data_to);
1011 1012
1012 flush_dcache_page(page); 1013 flush_dcache_page(page);
1013 1014
1014 out: 1015 out:
1015 return ret; 1016 return ret;
1016 } 1017 }
1017 1018
1018 /* 1019 /*
1019 * This function will only grab one clusters 1020 * This function will only grab one clusters worth of pages.
1020 */ 1021 */
1021 static int ocfs2_grab_pages_for_write(struct 1022 static int ocfs2_grab_pages_for_write(struct address_space *mapping,
1022 struct 1023 struct ocfs2_write_ctxt *wc,
1023 u32 cpo 1024 u32 cpos, loff_t user_pos,
1024 unsigne 1025 unsigned user_len, int new,
1025 struct 1026 struct page *mmap_page)
1026 { 1027 {
1027 int ret = 0, i; 1028 int ret = 0, i;
1028 unsigned long start, target_index, en 1029 unsigned long start, target_index, end_index, index;
1029 struct inode *inode = mapping->host; 1030 struct inode *inode = mapping->host;
1030 loff_t last_byte; 1031 loff_t last_byte;
1031 1032
1032 target_index = user_pos >> PAGE_SHIFT 1033 target_index = user_pos >> PAGE_SHIFT;
1033 1034
1034 /* 1035 /*
1035 * Figure out how many pages we'll be 1036 * Figure out how many pages we'll be manipulating here. For
1036 * non allocating write, we just chan 1037 * non allocating write, we just change the one
1037 * page. Otherwise, we'll need a whol 1038 * page. Otherwise, we'll need a whole clusters worth. If we're
1038 * writing past i_size, we only need 1039 * writing past i_size, we only need enough pages to cover the
1039 * last page of the write. 1040 * last page of the write.
1040 */ 1041 */
1041 if (new) { 1042 if (new) {
1042 wc->w_num_pages = ocfs2_pages 1043 wc->w_num_pages = ocfs2_pages_per_cluster(inode->i_sb);
1043 start = ocfs2_align_clusters_ 1044 start = ocfs2_align_clusters_to_page_index(inode->i_sb, cpos);
1044 /* 1045 /*
1045 * We need the index *past* t 1046 * We need the index *past* the last page we could possibly
1046 * touch. This is the page p 1047 * touch. This is the page past the end of the write or
1047 * i_size, whichever is great 1048 * i_size, whichever is greater.
1048 */ 1049 */
1049 last_byte = max(user_pos + us 1050 last_byte = max(user_pos + user_len, i_size_read(inode));
1050 BUG_ON(last_byte < 1); 1051 BUG_ON(last_byte < 1);
1051 end_index = ((last_byte - 1) 1052 end_index = ((last_byte - 1) >> PAGE_SHIFT) + 1;
1052 if ((start + wc->w_num_pages) 1053 if ((start + wc->w_num_pages) > end_index)
1053 wc->w_num_pages = end 1054 wc->w_num_pages = end_index - start;
1054 } else { 1055 } else {
1055 wc->w_num_pages = 1; 1056 wc->w_num_pages = 1;
1056 start = target_index; 1057 start = target_index;
1057 } 1058 }
1058 end_index = (user_pos + user_len - 1) 1059 end_index = (user_pos + user_len - 1) >> PAGE_SHIFT;
1059 1060
1060 for(i = 0; i < wc->w_num_pages; i++) 1061 for(i = 0; i < wc->w_num_pages; i++) {
1061 index = start + i; 1062 index = start + i;
1062 1063
1063 if (index >= target_index && 1064 if (index >= target_index && index <= end_index &&
1064 wc->w_type == OCFS2_WRITE 1065 wc->w_type == OCFS2_WRITE_MMAP) {
1065 /* 1066 /*
1066 * ocfs2_pagemkwrite( 1067 * ocfs2_pagemkwrite() is a little different
1067 * and wants us to di 1068 * and wants us to directly use the page
1068 * passed in. 1069 * passed in.
1069 */ 1070 */
1070 lock_page(mmap_page); 1071 lock_page(mmap_page);
1071 1072
1072 /* Exit and let the c 1073 /* Exit and let the caller retry */
1073 if (mmap_page->mappin 1074 if (mmap_page->mapping != mapping) {
1074 WARN_ON(mmap_ 1075 WARN_ON(mmap_page->mapping);
1075 unlock_page(m 1076 unlock_page(mmap_page);
1076 ret = -EAGAIN 1077 ret = -EAGAIN;
1077 goto out; 1078 goto out;
1078 } 1079 }
1079 1080
1080 get_page(mmap_page); 1081 get_page(mmap_page);
1081 wc->w_pages[i] = mmap 1082 wc->w_pages[i] = mmap_page;
1082 wc->w_target_locked = 1083 wc->w_target_locked = true;
1083 } else if (index >= target_in 1084 } else if (index >= target_index && index <= end_index &&
1084 wc->w_type == OCFS 1085 wc->w_type == OCFS2_WRITE_DIRECT) {
1085 /* Direct write has n 1086 /* Direct write has no mapping page. */
1086 wc->w_pages[i] = NULL 1087 wc->w_pages[i] = NULL;
1087 continue; 1088 continue;
1088 } else { 1089 } else {
1089 wc->w_pages[i] = find 1090 wc->w_pages[i] = find_or_create_page(mapping, index,
1090 1091 GFP_NOFS);
1091 if (!wc->w_pages[i]) 1092 if (!wc->w_pages[i]) {
1092 ret = -ENOMEM 1093 ret = -ENOMEM;
1093 mlog_errno(re 1094 mlog_errno(ret);
1094 goto out; 1095 goto out;
1095 } 1096 }
1096 } 1097 }
1097 wait_for_stable_page(wc->w_pa 1098 wait_for_stable_page(wc->w_pages[i]);
1098 1099
1099 if (index == target_index) 1100 if (index == target_index)
1100 wc->w_target_page = w 1101 wc->w_target_page = wc->w_pages[i];
1101 } 1102 }
1102 out: 1103 out:
1103 if (ret) 1104 if (ret)
1104 wc->w_target_locked = false; 1105 wc->w_target_locked = false;
1105 return ret; 1106 return ret;
1106 } 1107 }
1107 1108
1108 /* 1109 /*
1109 * Prepare a single cluster for write one clu 1110 * Prepare a single cluster for write one cluster into the file.
1110 */ 1111 */
1111 static int ocfs2_write_cluster(struct address 1112 static int ocfs2_write_cluster(struct address_space *mapping,
1112 u32 *phys, uns 1113 u32 *phys, unsigned int new,
1113 unsigned int c 1114 unsigned int clear_unwritten,
1114 unsigned int s 1115 unsigned int should_zero,
1115 struct ocfs2_a 1116 struct ocfs2_alloc_context *data_ac,
1116 struct ocfs2_a 1117 struct ocfs2_alloc_context *meta_ac,
1117 struct ocfs2_w 1118 struct ocfs2_write_ctxt *wc, u32 cpos,
1118 loff_t user_po 1119 loff_t user_pos, unsigned user_len)
1119 { 1120 {
1120 int ret, i; 1121 int ret, i;
1121 u64 p_blkno; 1122 u64 p_blkno;
1122 struct inode *inode = mapping->host; 1123 struct inode *inode = mapping->host;
1123 struct ocfs2_extent_tree et; 1124 struct ocfs2_extent_tree et;
1124 int bpc = ocfs2_clusters_to_blocks(in 1125 int bpc = ocfs2_clusters_to_blocks(inode->i_sb, 1);
1125 1126
1126 if (new) { 1127 if (new) {
1127 u32 tmp_pos; 1128 u32 tmp_pos;
1128 1129
1129 /* 1130 /*
1130 * This is safe to call with 1131 * This is safe to call with the page locks - it won't take
1131 * any additional semaphores 1132 * any additional semaphores or cluster locks.
1132 */ 1133 */
1133 tmp_pos = cpos; 1134 tmp_pos = cpos;
1134 ret = ocfs2_add_inode_data(OC 1135 ret = ocfs2_add_inode_data(OCFS2_SB(inode->i_sb), inode,
1135 &t 1136 &tmp_pos, 1, !clear_unwritten,
1136 wc 1137 wc->w_di_bh, wc->w_handle,
1137 da 1138 data_ac, meta_ac, NULL);
1138 /* 1139 /*
1139 * This shouldn't happen beca 1140 * This shouldn't happen because we must have already
1140 * calculated the correct met 1141 * calculated the correct meta data allocation required. The
1141 * internal tree allocation c 1142 * internal tree allocation code should know how to increase
1142 * transaction credits itself 1143 * transaction credits itself.
1143 * 1144 *
1144 * If need be, we could handl 1145 * If need be, we could handle -EAGAIN for a
1145 * RESTART_TRANS here. 1146 * RESTART_TRANS here.
1146 */ 1147 */
1147 mlog_bug_on_msg(ret == -EAGAI 1148 mlog_bug_on_msg(ret == -EAGAIN,
1148 "Inode %llu: 1149 "Inode %llu: EAGAIN return during allocation.\n",
1149 (unsigned lon 1150 (unsigned long long)OCFS2_I(inode)->ip_blkno);
1150 if (ret < 0) { 1151 if (ret < 0) {
1151 mlog_errno(ret); 1152 mlog_errno(ret);
1152 goto out; 1153 goto out;
1153 } 1154 }
1154 } else if (clear_unwritten) { 1155 } else if (clear_unwritten) {
1155 ocfs2_init_dinode_extent_tree 1156 ocfs2_init_dinode_extent_tree(&et, INODE_CACHE(inode),
1156 1157 wc->w_di_bh);
1157 ret = ocfs2_mark_extent_writt 1158 ret = ocfs2_mark_extent_written(inode, &et,
1158 1159 wc->w_handle, cpos, 1, *phys,
1159 1160 meta_ac, &wc->w_dealloc);
1160 if (ret < 0) { 1161 if (ret < 0) {
1161 mlog_errno(ret); 1162 mlog_errno(ret);
1162 goto out; 1163 goto out;
1163 } 1164 }
1164 } 1165 }
1165 1166
1166 /* 1167 /*
1167 * The only reason this should fail i 1168 * The only reason this should fail is due to an inability to
1168 * find the extent added. 1169 * find the extent added.
1169 */ 1170 */
1170 ret = ocfs2_get_clusters(inode, cpos, 1171 ret = ocfs2_get_clusters(inode, cpos, phys, NULL, NULL);
1171 if (ret < 0) { 1172 if (ret < 0) {
1172 mlog(ML_ERROR, "Get physical 1173 mlog(ML_ERROR, "Get physical blkno failed for inode %llu, "
1173 "at logical clust 1174 "at logical cluster %u",
1174 (unsigned long lo 1175 (unsigned long long)OCFS2_I(inode)->ip_blkno, cpos);
1175 goto out; 1176 goto out;
1176 } 1177 }
1177 1178
1178 BUG_ON(*phys == 0); 1179 BUG_ON(*phys == 0);
1179 1180
1180 p_blkno = ocfs2_clusters_to_blocks(in 1181 p_blkno = ocfs2_clusters_to_blocks(inode->i_sb, *phys);
1181 if (!should_zero) 1182 if (!should_zero)
1182 p_blkno += (user_pos >> inode 1183 p_blkno += (user_pos >> inode->i_sb->s_blocksize_bits) & (u64)(bpc - 1);
1183 1184
1184 for(i = 0; i < wc->w_num_pages; i++) 1185 for(i = 0; i < wc->w_num_pages; i++) {
1185 int tmpret; 1186 int tmpret;
1186 1187
1187 /* This is the direct io targ 1188 /* This is the direct io target page. */
1188 if (wc->w_pages[i] == NULL) { 1189 if (wc->w_pages[i] == NULL) {
1189 p_blkno++; 1190 p_blkno++;
1190 continue; 1191 continue;
1191 } 1192 }
1192 1193
1193 tmpret = ocfs2_prepare_page_f 1194 tmpret = ocfs2_prepare_page_for_write(inode, &p_blkno, wc,
1194 1195 wc->w_pages[i], cpos,
1195 1196 user_pos, user_len,
1196 1197 should_zero);
1197 if (tmpret) { 1198 if (tmpret) {
1198 mlog_errno(tmpret); 1199 mlog_errno(tmpret);
1199 if (ret == 0) 1200 if (ret == 0)
1200 ret = tmpret; 1201 ret = tmpret;
1201 } 1202 }
1202 } 1203 }
1203 1204
1204 /* 1205 /*
1205 * We only have cleanup to do in case 1206 * We only have cleanup to do in case of allocating write.
1206 */ 1207 */
1207 if (ret && new) 1208 if (ret && new)
1208 ocfs2_write_failure(inode, wc 1209 ocfs2_write_failure(inode, wc, user_pos, user_len);
1209 1210
1210 out: 1211 out:
1211 1212
1212 return ret; 1213 return ret;
1213 } 1214 }
1214 1215
1215 static int ocfs2_write_cluster_by_desc(struct 1216 static int ocfs2_write_cluster_by_desc(struct address_space *mapping,
1216 struct 1217 struct ocfs2_alloc_context *data_ac,
1217 struct 1218 struct ocfs2_alloc_context *meta_ac,
1218 struct 1219 struct ocfs2_write_ctxt *wc,
1219 loff_t 1220 loff_t pos, unsigned len)
1220 { 1221 {
1221 int ret, i; 1222 int ret, i;
1222 loff_t cluster_off; 1223 loff_t cluster_off;
1223 unsigned int local_len = len; 1224 unsigned int local_len = len;
1224 struct ocfs2_write_cluster_desc *desc 1225 struct ocfs2_write_cluster_desc *desc;
1225 struct ocfs2_super *osb = OCFS2_SB(ma 1226 struct ocfs2_super *osb = OCFS2_SB(mapping->host->i_sb);
1226 1227
1227 for (i = 0; i < wc->w_clen; i++) { 1228 for (i = 0; i < wc->w_clen; i++) {
1228 desc = &wc->w_desc[i]; 1229 desc = &wc->w_desc[i];
1229 1230
1230 /* 1231 /*
1231 * We have to make sure that 1232 * We have to make sure that the total write passed in
1232 * doesn't extend past a sing 1233 * doesn't extend past a single cluster.
1233 */ 1234 */
1234 local_len = len; 1235 local_len = len;
1235 cluster_off = pos & (osb->s_c 1236 cluster_off = pos & (osb->s_clustersize - 1);
1236 if ((cluster_off + local_len) 1237 if ((cluster_off + local_len) > osb->s_clustersize)
1237 local_len = osb->s_cl 1238 local_len = osb->s_clustersize - cluster_off;
1238 1239
1239 ret = ocfs2_write_cluster(map 1240 ret = ocfs2_write_cluster(mapping, &desc->c_phys,
1240 des 1241 desc->c_new,
1241 des 1242 desc->c_clear_unwritten,
1242 des 1243 desc->c_needs_zero,
1243 dat 1244 data_ac, meta_ac,
1244 wc, 1245 wc, desc->c_cpos, pos, local_len);
1245 if (ret) { 1246 if (ret) {
1246 mlog_errno(ret); 1247 mlog_errno(ret);
1247 goto out; 1248 goto out;
1248 } 1249 }
1249 1250
1250 len -= local_len; 1251 len -= local_len;
1251 pos += local_len; 1252 pos += local_len;
1252 } 1253 }
1253 1254
1254 ret = 0; 1255 ret = 0;
1255 out: 1256 out:
1256 return ret; 1257 return ret;
1257 } 1258 }
1258 1259
1259 /* 1260 /*
1260 * ocfs2_write_end() wants to know which part 1261 * ocfs2_write_end() wants to know which parts of the target page it
1261 * should complete the write on. It's easiest 1262 * should complete the write on. It's easiest to compute them ahead of
1262 * time when a more complete view of the writ 1263 * time when a more complete view of the write is available.
1263 */ 1264 */
1264 static void ocfs2_set_target_boundaries(struc 1265 static void ocfs2_set_target_boundaries(struct ocfs2_super *osb,
1265 struc 1266 struct ocfs2_write_ctxt *wc,
1266 loff_ 1267 loff_t pos, unsigned len, int alloc)
1267 { 1268 {
1268 struct ocfs2_write_cluster_desc *desc 1269 struct ocfs2_write_cluster_desc *desc;
1269 1270
1270 wc->w_target_from = pos & (PAGE_SIZE 1271 wc->w_target_from = pos & (PAGE_SIZE - 1);
1271 wc->w_target_to = wc->w_target_from + 1272 wc->w_target_to = wc->w_target_from + len;
1272 1273
1273 if (alloc == 0) 1274 if (alloc == 0)
1274 return; 1275 return;
1275 1276
1276 /* 1277 /*
1277 * Allocating write - we may have dif 1278 * Allocating write - we may have different boundaries based
1278 * on page size and cluster size. 1279 * on page size and cluster size.
1279 * 1280 *
1280 * NOTE: We can no longer compute one 1281 * NOTE: We can no longer compute one value from the other as
1281 * the actual write length and user p 1282 * the actual write length and user provided length may be
1282 * different. 1283 * different.
1283 */ 1284 */
1284 1285
1285 if (wc->w_large_pages) { 1286 if (wc->w_large_pages) {
1286 /* 1287 /*
1287 * We only care about the 1st 1288 * We only care about the 1st and last cluster within
1288 * our range and whether they 1289 * our range and whether they should be zero'd or not. Either
1289 * value may be extended out 1290 * value may be extended out to the start/end of a
1290 * newly allocated cluster. 1291 * newly allocated cluster.
1291 */ 1292 */
1292 desc = &wc->w_desc[0]; 1293 desc = &wc->w_desc[0];
1293 if (desc->c_needs_zero) 1294 if (desc->c_needs_zero)
1294 ocfs2_figure_cluster_ 1295 ocfs2_figure_cluster_boundaries(osb,
1295 1296 desc->c_cpos,
1296 1297 &wc->w_target_from,
1297 1298 NULL);
1298 1299
1299 desc = &wc->w_desc[wc->w_clen 1300 desc = &wc->w_desc[wc->w_clen - 1];
1300 if (desc->c_needs_zero) 1301 if (desc->c_needs_zero)
1301 ocfs2_figure_cluster_ 1302 ocfs2_figure_cluster_boundaries(osb,
1302 1303 desc->c_cpos,
1303 1304 NULL,
1304 1305 &wc->w_target_to);
1305 } else { 1306 } else {
1306 wc->w_target_from = 0; 1307 wc->w_target_from = 0;
1307 wc->w_target_to = PAGE_SIZE; 1308 wc->w_target_to = PAGE_SIZE;
1308 } 1309 }
1309 } 1310 }
1310 1311
1311 /* 1312 /*
1312 * Check if this extent is marked UNWRITTEN b 1313 * Check if this extent is marked UNWRITTEN by direct io. If so, we need not to
1313 * do the zero work. And should not to clear 1314 * do the zero work. And should not to clear UNWRITTEN since it will be cleared
1314 * by the direct io procedure. 1315 * by the direct io procedure.
1315 * If this is a new extent that allocated by 1316 * If this is a new extent that allocated by direct io, we should mark it in
1316 * the ip_unwritten_list. 1317 * the ip_unwritten_list.
1317 */ 1318 */
1318 static int ocfs2_unwritten_check(struct inode 1319 static int ocfs2_unwritten_check(struct inode *inode,
1319 struct ocfs2 1320 struct ocfs2_write_ctxt *wc,
1320 struct ocfs2 1321 struct ocfs2_write_cluster_desc *desc)
1321 { 1322 {
1322 struct ocfs2_inode_info *oi = OCFS2_I 1323 struct ocfs2_inode_info *oi = OCFS2_I(inode);
1323 struct ocfs2_unwritten_extent *ue = N 1324 struct ocfs2_unwritten_extent *ue = NULL, *new = NULL;
1324 int ret = 0; 1325 int ret = 0;
1325 1326
1326 if (!desc->c_needs_zero) 1327 if (!desc->c_needs_zero)
1327 return 0; 1328 return 0;
1328 1329
1329 retry: 1330 retry:
1330 spin_lock(&oi->ip_lock); 1331 spin_lock(&oi->ip_lock);
1331 /* Needs not to zero no metter buffer 1332 /* Needs not to zero no metter buffer or direct. The one who is zero
1332 * the cluster is doing zero. And he 1333 * the cluster is doing zero. And he will clear unwritten after all
1333 * cluster io finished. */ 1334 * cluster io finished. */
1334 list_for_each_entry(ue, &oi->ip_unwri 1335 list_for_each_entry(ue, &oi->ip_unwritten_list, ue_ip_node) {
1335 if (desc->c_cpos == ue->ue_cp 1336 if (desc->c_cpos == ue->ue_cpos) {
1336 BUG_ON(desc->c_new); 1337 BUG_ON(desc->c_new);
1337 desc->c_needs_zero = 1338 desc->c_needs_zero = 0;
1338 desc->c_clear_unwritt 1339 desc->c_clear_unwritten = 0;
1339 goto unlock; 1340 goto unlock;
1340 } 1341 }
1341 } 1342 }
1342 1343
1343 if (wc->w_type != OCFS2_WRITE_DIRECT) 1344 if (wc->w_type != OCFS2_WRITE_DIRECT)
1344 goto unlock; 1345 goto unlock;
1345 1346
1346 if (new == NULL) { 1347 if (new == NULL) {
1347 spin_unlock(&oi->ip_lock); 1348 spin_unlock(&oi->ip_lock);
1348 new = kmalloc(sizeof(struct o 1349 new = kmalloc(sizeof(struct ocfs2_unwritten_extent),
1349 GFP_NOFS); 1350 GFP_NOFS);
1350 if (new == NULL) { 1351 if (new == NULL) {
1351 ret = -ENOMEM; 1352 ret = -ENOMEM;
1352 goto out; 1353 goto out;
1353 } 1354 }
1354 goto retry; 1355 goto retry;
1355 } 1356 }
1356 /* This direct write will doing zero. 1357 /* This direct write will doing zero. */
1357 new->ue_cpos = desc->c_cpos; 1358 new->ue_cpos = desc->c_cpos;
1358 new->ue_phys = desc->c_phys; 1359 new->ue_phys = desc->c_phys;
1359 desc->c_clear_unwritten = 0; 1360 desc->c_clear_unwritten = 0;
1360 list_add_tail(&new->ue_ip_node, &oi-> 1361 list_add_tail(&new->ue_ip_node, &oi->ip_unwritten_list);
1361 list_add_tail(&new->ue_node, &wc->w_u 1362 list_add_tail(&new->ue_node, &wc->w_unwritten_list);
1362 wc->w_unwritten_count++; 1363 wc->w_unwritten_count++;
1363 new = NULL; 1364 new = NULL;
1364 unlock: 1365 unlock:
1365 spin_unlock(&oi->ip_lock); 1366 spin_unlock(&oi->ip_lock);
1366 out: 1367 out:
1367 kfree(new); 1368 kfree(new);
1368 return ret; 1369 return ret;
1369 } 1370 }
1370 1371
1371 /* 1372 /*
1372 * Populate each single-cluster write descrip 1373 * Populate each single-cluster write descriptor in the write context
1373 * with information about the i/o to be done. 1374 * with information about the i/o to be done.
1374 * 1375 *
1375 * Returns the number of clusters that will h 1376 * Returns the number of clusters that will have to be allocated, as
1376 * well as a worst case estimate of the numbe 1377 * well as a worst case estimate of the number of extent records that
1377 * would have to be created during a write to 1378 * would have to be created during a write to an unwritten region.
1378 */ 1379 */
1379 static int ocfs2_populate_write_desc(struct i 1380 static int ocfs2_populate_write_desc(struct inode *inode,
1380 struct o 1381 struct ocfs2_write_ctxt *wc,
1381 unsigned 1382 unsigned int *clusters_to_alloc,
1382 unsigned 1383 unsigned int *extents_to_split)
1383 { 1384 {
1384 int ret; 1385 int ret;
1385 struct ocfs2_write_cluster_desc *desc 1386 struct ocfs2_write_cluster_desc *desc;
1386 unsigned int num_clusters = 0; 1387 unsigned int num_clusters = 0;
1387 unsigned int ext_flags = 0; 1388 unsigned int ext_flags = 0;
1388 u32 phys = 0; 1389 u32 phys = 0;
1389 int i; 1390 int i;
1390 1391
1391 *clusters_to_alloc = 0; 1392 *clusters_to_alloc = 0;
1392 *extents_to_split = 0; 1393 *extents_to_split = 0;
1393 1394
1394 for (i = 0; i < wc->w_clen; i++) { 1395 for (i = 0; i < wc->w_clen; i++) {
1395 desc = &wc->w_desc[i]; 1396 desc = &wc->w_desc[i];
1396 desc->c_cpos = wc->w_cpos + i 1397 desc->c_cpos = wc->w_cpos + i;
1397 1398
1398 if (num_clusters == 0) { 1399 if (num_clusters == 0) {
1399 /* 1400 /*
1400 * Need to look up th 1401 * Need to look up the next extent record.
1401 */ 1402 */
1402 ret = ocfs2_get_clust 1403 ret = ocfs2_get_clusters(inode, desc->c_cpos, &phys,
1403 1404 &num_clusters, &ext_flags);
1404 if (ret) { 1405 if (ret) {
1405 mlog_errno(re 1406 mlog_errno(ret);
1406 goto out; 1407 goto out;
1407 } 1408 }
1408 1409
1409 /* We should already 1410 /* We should already CoW the refcountd extent. */
1410 BUG_ON(ext_flags & OC 1411 BUG_ON(ext_flags & OCFS2_EXT_REFCOUNTED);
1411 1412
1412 /* 1413 /*
1413 * Assume worst case 1414 * Assume worst case - that we're writing in
1414 * the middle of the 1415 * the middle of the extent.
1415 * 1416 *
1416 * We can assume that 1417 * We can assume that the write proceeds from
1417 * left to right, in 1418 * left to right, in which case the extent
1418 * insert code is sma 1419 * insert code is smart enough to coalesce the
1419 * next splits into t 1420 * next splits into the previous records created.
1420 */ 1421 */
1421 if (ext_flags & OCFS2 1422 if (ext_flags & OCFS2_EXT_UNWRITTEN)
1422 *extents_to_s 1423 *extents_to_split = *extents_to_split + 2;
1423 } else if (phys) { 1424 } else if (phys) {
1424 /* 1425 /*
1425 * Only increment phy 1426 * Only increment phys if it doesn't describe
1426 * a hole. 1427 * a hole.
1427 */ 1428 */
1428 phys++; 1429 phys++;
1429 } 1430 }
1430 1431
1431 /* 1432 /*
1432 * If w_first_new_cpos is < U 1433 * If w_first_new_cpos is < UINT_MAX, we have a non-sparse
1433 * file that got extended. w 1434 * file that got extended. w_first_new_cpos tells us
1434 * where the newly allocated 1435 * where the newly allocated clusters are so we can
1435 * zero them. 1436 * zero them.
1436 */ 1437 */
1437 if (desc->c_cpos >= wc->w_fir 1438 if (desc->c_cpos >= wc->w_first_new_cpos) {
1438 BUG_ON(phys == 0); 1439 BUG_ON(phys == 0);
1439 desc->c_needs_zero = 1440 desc->c_needs_zero = 1;
1440 } 1441 }
1441 1442
1442 desc->c_phys = phys; 1443 desc->c_phys = phys;
1443 if (phys == 0) { 1444 if (phys == 0) {
1444 desc->c_new = 1; 1445 desc->c_new = 1;
1445 desc->c_needs_zero = 1446 desc->c_needs_zero = 1;
1446 desc->c_clear_unwritt 1447 desc->c_clear_unwritten = 1;
1447 *clusters_to_alloc = 1448 *clusters_to_alloc = *clusters_to_alloc + 1;
1448 } 1449 }
1449 1450
1450 if (ext_flags & OCFS2_EXT_UNW 1451 if (ext_flags & OCFS2_EXT_UNWRITTEN) {
1451 desc->c_clear_unwritt 1452 desc->c_clear_unwritten = 1;
1452 desc->c_needs_zero = 1453 desc->c_needs_zero = 1;
1453 } 1454 }
1454 1455
1455 ret = ocfs2_unwritten_check(i 1456 ret = ocfs2_unwritten_check(inode, wc, desc);
1456 if (ret) { 1457 if (ret) {
1457 mlog_errno(ret); 1458 mlog_errno(ret);
1458 goto out; 1459 goto out;
1459 } 1460 }
1460 1461
1461 num_clusters--; 1462 num_clusters--;
1462 } 1463 }
1463 1464
1464 ret = 0; 1465 ret = 0;
1465 out: 1466 out:
1466 return ret; 1467 return ret;
1467 } 1468 }
1468 1469
1469 static int ocfs2_write_begin_inline(struct ad 1470 static int ocfs2_write_begin_inline(struct address_space *mapping,
1470 struct in 1471 struct inode *inode,
1471 struct oc 1472 struct ocfs2_write_ctxt *wc)
1472 { 1473 {
1473 int ret; 1474 int ret;
1474 struct ocfs2_super *osb = OCFS2_SB(in 1475 struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
1475 struct page *page; 1476 struct page *page;
1476 handle_t *handle; 1477 handle_t *handle;
1477 struct ocfs2_dinode *di = (struct ocf 1478 struct ocfs2_dinode *di = (struct ocfs2_dinode *)wc->w_di_bh->b_data;
1478 1479
1479 handle = ocfs2_start_trans(osb, OCFS2 1480 handle = ocfs2_start_trans(osb, OCFS2_INODE_UPDATE_CREDITS);
1480 if (IS_ERR(handle)) { 1481 if (IS_ERR(handle)) {
1481 ret = PTR_ERR(handle); 1482 ret = PTR_ERR(handle);
1482 mlog_errno(ret); 1483 mlog_errno(ret);
1483 goto out; 1484 goto out;
1484 } 1485 }
1485 1486
1486 page = find_or_create_page(mapping, 0 1487 page = find_or_create_page(mapping, 0, GFP_NOFS);
1487 if (!page) { 1488 if (!page) {
1488 ocfs2_commit_trans(osb, handl 1489 ocfs2_commit_trans(osb, handle);
1489 ret = -ENOMEM; 1490 ret = -ENOMEM;
1490 mlog_errno(ret); 1491 mlog_errno(ret);
1491 goto out; 1492 goto out;
1492 } 1493 }
1493 /* 1494 /*
1494 * If we don't set w_num_pages then t 1495 * If we don't set w_num_pages then this page won't get unlocked
1495 * and freed on cleanup of the write 1496 * and freed on cleanup of the write context.
1496 */ 1497 */
1497 wc->w_pages[0] = wc->w_target_page = 1498 wc->w_pages[0] = wc->w_target_page = page;
1498 wc->w_num_pages = 1; 1499 wc->w_num_pages = 1;
1499 1500
1500 ret = ocfs2_journal_access_di(handle, 1501 ret = ocfs2_journal_access_di(handle, INODE_CACHE(inode), wc->w_di_bh,
1501 OCFS2_J 1502 OCFS2_JOURNAL_ACCESS_WRITE);
1502 if (ret) { 1503 if (ret) {
1503 ocfs2_commit_trans(osb, handl 1504 ocfs2_commit_trans(osb, handle);
1504 1505
1505 mlog_errno(ret); 1506 mlog_errno(ret);
1506 goto out; 1507 goto out;
1507 } 1508 }
1508 1509
1509 if (!(OCFS2_I(inode)->ip_dyn_features 1510 if (!(OCFS2_I(inode)->ip_dyn_features & OCFS2_INLINE_DATA_FL))
1510 ocfs2_set_inode_data_inline(i 1511 ocfs2_set_inode_data_inline(inode, di);
1511 1512
1512 if (!PageUptodate(page)) { 1513 if (!PageUptodate(page)) {
1513 ret = ocfs2_read_inline_data( 1514 ret = ocfs2_read_inline_data(inode, page, wc->w_di_bh);
1514 if (ret) { 1515 if (ret) {
1515 ocfs2_commit_trans(os 1516 ocfs2_commit_trans(osb, handle);
1516 1517
1517 goto out; 1518 goto out;
1518 } 1519 }
1519 } 1520 }
1520 1521
1521 wc->w_handle = handle; 1522 wc->w_handle = handle;
1522 out: 1523 out:
1523 return ret; 1524 return ret;
1524 } 1525 }
1525 1526
1526 int ocfs2_size_fits_inline_data(struct buffer 1527 int ocfs2_size_fits_inline_data(struct buffer_head *di_bh, u64 new_size)
1527 { 1528 {
1528 struct ocfs2_dinode *di = (struct ocf 1529 struct ocfs2_dinode *di = (struct ocfs2_dinode *)di_bh->b_data;
1529 1530
1530 if (new_size <= le16_to_cpu(di->id2.i 1531 if (new_size <= le16_to_cpu(di->id2.i_data.id_count))
1531 return 1; 1532 return 1;
1532 return 0; 1533 return 0;
1533 } 1534 }
1534 1535
1535 static int ocfs2_try_to_write_inline_data(str 1536 static int ocfs2_try_to_write_inline_data(struct address_space *mapping,
1536 str 1537 struct inode *inode, loff_t pos,
1537 uns 1538 unsigned len, struct page *mmap_page,
1538 str 1539 struct ocfs2_write_ctxt *wc)
1539 { 1540 {
1540 int ret, written = 0; 1541 int ret, written = 0;
1541 loff_t end = pos + len; 1542 loff_t end = pos + len;
1542 struct ocfs2_inode_info *oi = OCFS2_I 1543 struct ocfs2_inode_info *oi = OCFS2_I(inode);
1543 struct ocfs2_dinode *di = NULL; 1544 struct ocfs2_dinode *di = NULL;
1544 1545
1545 trace_ocfs2_try_to_write_inline_data( 1546 trace_ocfs2_try_to_write_inline_data((unsigned long long)oi->ip_blkno,
1546 1547 len, (unsigned long long)pos,
1547 1548 oi->ip_dyn_features);
1548 1549
1549 /* 1550 /*
1550 * Handle inodes which already have i 1551 * Handle inodes which already have inline data 1st.
1551 */ 1552 */
1552 if (oi->ip_dyn_features & OCFS2_INLIN 1553 if (oi->ip_dyn_features & OCFS2_INLINE_DATA_FL) {
1553 if (mmap_page == NULL && 1554 if (mmap_page == NULL &&
1554 ocfs2_size_fits_inline_da 1555 ocfs2_size_fits_inline_data(wc->w_di_bh, end))
1555 goto do_inline_write; 1556 goto do_inline_write;
1556 1557
1557 /* 1558 /*
1558 * The write won't fit - we h 1559 * The write won't fit - we have to give this inode an
1559 * inline extent list now. 1560 * inline extent list now.
1560 */ 1561 */
1561 ret = ocfs2_convert_inline_da 1562 ret = ocfs2_convert_inline_data_to_extents(inode, wc->w_di_bh);
1562 if (ret) 1563 if (ret)
1563 mlog_errno(ret); 1564 mlog_errno(ret);
1564 goto out; 1565 goto out;
1565 } 1566 }
1566 1567
1567 /* 1568 /*
1568 * Check whether the inode can accept 1569 * Check whether the inode can accept inline data.
1569 */ 1570 */
1570 if (oi->ip_clusters != 0 || i_size_re 1571 if (oi->ip_clusters != 0 || i_size_read(inode) != 0)
1571 return 0; 1572 return 0;
1572 1573
1573 /* 1574 /*
1574 * Check whether the write can fit. 1575 * Check whether the write can fit.
1575 */ 1576 */
1576 di = (struct ocfs2_dinode *)wc->w_di_ 1577 di = (struct ocfs2_dinode *)wc->w_di_bh->b_data;
1577 if (mmap_page || 1578 if (mmap_page ||
1578 end > ocfs2_max_inline_data_with_ 1579 end > ocfs2_max_inline_data_with_xattr(inode->i_sb, di))
1579 return 0; 1580 return 0;
1580 1581
1581 do_inline_write: 1582 do_inline_write:
1582 ret = ocfs2_write_begin_inline(mappin 1583 ret = ocfs2_write_begin_inline(mapping, inode, wc);
1583 if (ret) { 1584 if (ret) {
1584 mlog_errno(ret); 1585 mlog_errno(ret);
1585 goto out; 1586 goto out;
1586 } 1587 }
1587 1588
1588 /* 1589 /*
1589 * This signals to the caller that th 1590 * This signals to the caller that the data can be written
1590 * inline. 1591 * inline.
1591 */ 1592 */
1592 written = 1; 1593 written = 1;
1593 out: 1594 out:
1594 return written ? written : ret; 1595 return written ? written : ret;
1595 } 1596 }
1596 1597
1597 /* 1598 /*
1598 * This function only does anything for file 1599 * This function only does anything for file systems which can't
1599 * handle sparse files. 1600 * handle sparse files.
1600 * 1601 *
1601 * What we want to do here is fill in any hol 1602 * What we want to do here is fill in any hole between the current end
1602 * of allocation and the end of our write. Th 1603 * of allocation and the end of our write. That way the rest of the
1603 * write path can treat it as an non-allocati 1604 * write path can treat it as an non-allocating write, which has no
1604 * special case code for sparse/nonsparse fil 1605 * special case code for sparse/nonsparse files.
1605 */ 1606 */
1606 static int ocfs2_expand_nonsparse_inode(struc 1607 static int ocfs2_expand_nonsparse_inode(struct inode *inode,
1607 struc 1608 struct buffer_head *di_bh,
1608 loff_ 1609 loff_t pos, unsigned len,
1609 struc 1610 struct ocfs2_write_ctxt *wc)
1610 { 1611 {
1611 int ret; 1612 int ret;
1612 loff_t newsize = pos + len; 1613 loff_t newsize = pos + len;
1613 1614
1614 BUG_ON(ocfs2_sparse_alloc(OCFS2_SB(in 1615 BUG_ON(ocfs2_sparse_alloc(OCFS2_SB(inode->i_sb)));
1615 1616
1616 if (newsize <= i_size_read(inode)) 1617 if (newsize <= i_size_read(inode))
1617 return 0; 1618 return 0;
1618 1619
1619 ret = ocfs2_extend_no_holes(inode, di 1620 ret = ocfs2_extend_no_holes(inode, di_bh, newsize, pos);
1620 if (ret) 1621 if (ret)
1621 mlog_errno(ret); 1622 mlog_errno(ret);
1622 1623
1623 /* There is no wc if this is call fro 1624 /* There is no wc if this is call from direct. */
1624 if (wc) 1625 if (wc)
1625 wc->w_first_new_cpos = 1626 wc->w_first_new_cpos =
1626 ocfs2_clusters_for_by 1627 ocfs2_clusters_for_bytes(inode->i_sb, i_size_read(inode));
1627 1628
1628 return ret; 1629 return ret;
1629 } 1630 }
1630 1631
1631 static int ocfs2_zero_tail(struct inode *inod 1632 static int ocfs2_zero_tail(struct inode *inode, struct buffer_head *di_bh,
1632 loff_t pos) 1633 loff_t pos)
1633 { 1634 {
1634 int ret = 0; 1635 int ret = 0;
1635 1636
1636 BUG_ON(!ocfs2_sparse_alloc(OCFS2_SB(i 1637 BUG_ON(!ocfs2_sparse_alloc(OCFS2_SB(inode->i_sb)));
1637 if (pos > i_size_read(inode)) 1638 if (pos > i_size_read(inode))
1638 ret = ocfs2_zero_extend(inode 1639 ret = ocfs2_zero_extend(inode, di_bh, pos);
1639 1640
1640 return ret; 1641 return ret;
1641 } 1642 }
1642 1643
1643 int ocfs2_write_begin_nolock(struct address_s 1644 int ocfs2_write_begin_nolock(struct address_space *mapping,
1644 loff_t pos, unsi 1645 loff_t pos, unsigned len, ocfs2_write_type_t type,
1645 struct page **pa 1646 struct page **pagep, void **fsdata,
1646 struct buffer_he 1647 struct buffer_head *di_bh, struct page *mmap_page)
1647 { 1648 {
1648 int ret, cluster_of_pages, credits = 1649 int ret, cluster_of_pages, credits = OCFS2_INODE_UPDATE_CREDITS;
1649 unsigned int clusters_to_alloc, exten 1650 unsigned int clusters_to_alloc, extents_to_split, clusters_need = 0;
1650 struct ocfs2_write_ctxt *wc; 1651 struct ocfs2_write_ctxt *wc;
1651 struct inode *inode = mapping->host; 1652 struct inode *inode = mapping->host;
1652 struct ocfs2_super *osb = OCFS2_SB(in 1653 struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
1653 struct ocfs2_dinode *di; 1654 struct ocfs2_dinode *di;
1654 struct ocfs2_alloc_context *data_ac = 1655 struct ocfs2_alloc_context *data_ac = NULL;
1655 struct ocfs2_alloc_context *meta_ac = 1656 struct ocfs2_alloc_context *meta_ac = NULL;
1656 handle_t *handle; 1657 handle_t *handle;
1657 struct ocfs2_extent_tree et; 1658 struct ocfs2_extent_tree et;
1658 int try_free = 1, ret1; 1659 int try_free = 1, ret1;
1659 1660
1660 try_again: 1661 try_again:
1661 ret = ocfs2_alloc_write_ctxt(&wc, osb 1662 ret = ocfs2_alloc_write_ctxt(&wc, osb, pos, len, type, di_bh);
1662 if (ret) { 1663 if (ret) {
1663 mlog_errno(ret); 1664 mlog_errno(ret);
1664 return ret; 1665 return ret;
1665 } 1666 }
1666 1667
1667 if (ocfs2_supports_inline_data(osb)) 1668 if (ocfs2_supports_inline_data(osb)) {
1668 ret = ocfs2_try_to_write_inli 1669 ret = ocfs2_try_to_write_inline_data(mapping, inode, pos, len,
1669 1670 mmap_page, wc);
1670 if (ret == 1) { 1671 if (ret == 1) {
1671 ret = 0; 1672 ret = 0;
1672 goto success; 1673 goto success;
1673 } 1674 }
1674 if (ret < 0) { 1675 if (ret < 0) {
1675 mlog_errno(ret); 1676 mlog_errno(ret);
1676 goto out; 1677 goto out;
1677 } 1678 }
1678 } 1679 }
1679 1680
1680 /* Direct io change i_size late, shou 1681 /* Direct io change i_size late, should not zero tail here. */
1681 if (type != OCFS2_WRITE_DIRECT) { 1682 if (type != OCFS2_WRITE_DIRECT) {
1682 if (ocfs2_sparse_alloc(osb)) 1683 if (ocfs2_sparse_alloc(osb))
1683 ret = ocfs2_zero_tail 1684 ret = ocfs2_zero_tail(inode, di_bh, pos);
1684 else 1685 else
1685 ret = ocfs2_expand_no 1686 ret = ocfs2_expand_nonsparse_inode(inode, di_bh, pos,
1686 1687 len, wc);
1687 if (ret) { 1688 if (ret) {
1688 mlog_errno(ret); 1689 mlog_errno(ret);
1689 goto out; 1690 goto out;
1690 } 1691 }
1691 } 1692 }
1692 1693
1693 ret = ocfs2_check_range_for_refcount( 1694 ret = ocfs2_check_range_for_refcount(inode, pos, len);
1694 if (ret < 0) { 1695 if (ret < 0) {
1695 mlog_errno(ret); 1696 mlog_errno(ret);
1696 goto out; 1697 goto out;
1697 } else if (ret == 1) { 1698 } else if (ret == 1) {
1698 clusters_need = wc->w_clen; 1699 clusters_need = wc->w_clen;
1699 ret = ocfs2_refcount_cow(inod 1700 ret = ocfs2_refcount_cow(inode, di_bh,
1700 wc-> 1701 wc->w_cpos, wc->w_clen, UINT_MAX);
1701 if (ret) { 1702 if (ret) {
1702 mlog_errno(ret); 1703 mlog_errno(ret);
1703 goto out; 1704 goto out;
1704 } 1705 }
1705 } 1706 }
1706 1707
1707 ret = ocfs2_populate_write_desc(inode 1708 ret = ocfs2_populate_write_desc(inode, wc, &clusters_to_alloc,
1708 &exte 1709 &extents_to_split);
1709 if (ret) { 1710 if (ret) {
1710 mlog_errno(ret); 1711 mlog_errno(ret);
1711 goto out; 1712 goto out;
1712 } 1713 }
1713 clusters_need += clusters_to_alloc; 1714 clusters_need += clusters_to_alloc;
1714 1715
1715 di = (struct ocfs2_dinode *)wc->w_di_ 1716 di = (struct ocfs2_dinode *)wc->w_di_bh->b_data;
1716 1717
1717 trace_ocfs2_write_begin_nolock( 1718 trace_ocfs2_write_begin_nolock(
1718 (unsigned long long)O 1719 (unsigned long long)OCFS2_I(inode)->ip_blkno,
1719 (long long)i_size_rea 1720 (long long)i_size_read(inode),
1720 le32_to_cpu(di->i_clu 1721 le32_to_cpu(di->i_clusters),
1721 pos, len, type, mmap_ 1722 pos, len, type, mmap_page,
1722 clusters_to_alloc, ex 1723 clusters_to_alloc, extents_to_split);
1723 1724
1724 /* 1725 /*
1725 * We set w_target_from, w_target_to 1726 * We set w_target_from, w_target_to here so that
1726 * ocfs2_write_end() knows which rang 1727 * ocfs2_write_end() knows which range in the target page to
1727 * write out. An allocation requires 1728 * write out. An allocation requires that we write the entire
1728 * cluster range. 1729 * cluster range.
1729 */ 1730 */
1730 if (clusters_to_alloc || extents_to_s 1731 if (clusters_to_alloc || extents_to_split) {
1731 /* 1732 /*
1732 * XXX: We are stretching the 1733 * XXX: We are stretching the limits of
1733 * ocfs2_lock_allocators(). I 1734 * ocfs2_lock_allocators(). It greatly over-estimates
1734 * the work to be done. 1735 * the work to be done.
1735 */ 1736 */
1736 ocfs2_init_dinode_extent_tree 1737 ocfs2_init_dinode_extent_tree(&et, INODE_CACHE(inode),
1737 1738 wc->w_di_bh);
1738 ret = ocfs2_lock_allocators(i 1739 ret = ocfs2_lock_allocators(inode, &et,
1739 c 1740 clusters_to_alloc, extents_to_split,
1740 & 1741 &data_ac, &meta_ac);
1741 if (ret) { 1742 if (ret) {
1742 mlog_errno(ret); 1743 mlog_errno(ret);
1743 goto out; 1744 goto out;
1744 } 1745 }
1745 1746
1746 if (data_ac) 1747 if (data_ac)
1747 data_ac->ac_resv = &O 1748 data_ac->ac_resv = &OCFS2_I(inode)->ip_la_data_resv;
1748 1749
1749 credits = ocfs2_calc_extend_c 1750 credits = ocfs2_calc_extend_credits(inode->i_sb,
1750 1751 &di->id2.i_list);
1751 } else if (type == OCFS2_WRITE_DIRECT 1752 } else if (type == OCFS2_WRITE_DIRECT)
1752 /* direct write needs not to 1753 /* direct write needs not to start trans if no extents alloc. */
1753 goto success; 1754 goto success;
1754 1755
1755 /* 1756 /*
1756 * We have to zero sparse allocated c 1757 * We have to zero sparse allocated clusters, unwritten extent clusters,
1757 * and non-sparse clusters we just ex 1758 * and non-sparse clusters we just extended. For non-sparse writes,
1758 * we know zeros will only be needed 1759 * we know zeros will only be needed in the first and/or last cluster.
1759 */ 1760 */
1760 if (wc->w_clen && (wc->w_desc[0].c_ne 1761 if (wc->w_clen && (wc->w_desc[0].c_needs_zero ||
1761 wc->w_desc[wc->w_c 1762 wc->w_desc[wc->w_clen - 1].c_needs_zero))
1762 cluster_of_pages = 1; 1763 cluster_of_pages = 1;
1763 else 1764 else
1764 cluster_of_pages = 0; 1765 cluster_of_pages = 0;
1765 1766
1766 ocfs2_set_target_boundaries(osb, wc, 1767 ocfs2_set_target_boundaries(osb, wc, pos, len, cluster_of_pages);
1767 1768
1768 handle = ocfs2_start_trans(osb, credi 1769 handle = ocfs2_start_trans(osb, credits);
1769 if (IS_ERR(handle)) { 1770 if (IS_ERR(handle)) {
1770 ret = PTR_ERR(handle); 1771 ret = PTR_ERR(handle);
1771 mlog_errno(ret); 1772 mlog_errno(ret);
1772 goto out; 1773 goto out;
1773 } 1774 }
1774 1775
1775 wc->w_handle = handle; 1776 wc->w_handle = handle;
1776 1777
1777 if (clusters_to_alloc) { 1778 if (clusters_to_alloc) {
1778 ret = dquot_alloc_space_nodir 1779 ret = dquot_alloc_space_nodirty(inode,
1779 ocfs2_clusters_to_byt 1780 ocfs2_clusters_to_bytes(osb->sb, clusters_to_alloc));
1780 if (ret) 1781 if (ret)
1781 goto out_commit; 1782 goto out_commit;
1782 } 1783 }
1783 1784
1784 ret = ocfs2_journal_access_di(handle, 1785 ret = ocfs2_journal_access_di(handle, INODE_CACHE(inode), wc->w_di_bh,
1785 OCFS2_J 1786 OCFS2_JOURNAL_ACCESS_WRITE);
1786 if (ret) { 1787 if (ret) {
1787 mlog_errno(ret); 1788 mlog_errno(ret);
1788 goto out_quota; 1789 goto out_quota;
1789 } 1790 }
1790 1791
1791 /* 1792 /*
1792 * Fill our page array first. That wa 1793 * Fill our page array first. That way we've grabbed enough so
1793 * that we can zero and flush if we e 1794 * that we can zero and flush if we error after adding the
1794 * extent. 1795 * extent.
1795 */ 1796 */
1796 ret = ocfs2_grab_pages_for_write(mapp 1797 ret = ocfs2_grab_pages_for_write(mapping, wc, wc->w_cpos, pos, len,
1797 clus 1798 cluster_of_pages, mmap_page);
1798 if (ret) { 1799 if (ret) {
1799 /* 1800 /*
1800 * ocfs2_grab_pages_for_write 1801 * ocfs2_grab_pages_for_write() returns -EAGAIN if it could not lock
1801 * the target page. In this c 1802 * the target page. In this case, we exit with no error and no target
1802 * page. This will trigger th 1803 * page. This will trigger the caller, page_mkwrite(), to re-try
1803 * the operation. 1804 * the operation.
1804 */ 1805 */
1805 if (type == OCFS2_WRITE_MMAP 1806 if (type == OCFS2_WRITE_MMAP && ret == -EAGAIN) {
1806 BUG_ON(wc->w_target_p 1807 BUG_ON(wc->w_target_page);
1807 ret = 0; 1808 ret = 0;
1808 goto out_quota; 1809 goto out_quota;
1809 } 1810 }
1810 1811
1811 mlog_errno(ret); 1812 mlog_errno(ret);
1812 goto out_quota; 1813 goto out_quota;
1813 } 1814 }
1814 1815
1815 ret = ocfs2_write_cluster_by_desc(map 1816 ret = ocfs2_write_cluster_by_desc(mapping, data_ac, meta_ac, wc, pos,
1816 len 1817 len);
1817 if (ret) { 1818 if (ret) {
1818 mlog_errno(ret); 1819 mlog_errno(ret);
1819 goto out_quota; 1820 goto out_quota;
1820 } 1821 }
1821 1822
1822 if (data_ac) 1823 if (data_ac)
1823 ocfs2_free_alloc_context(data 1824 ocfs2_free_alloc_context(data_ac);
1824 if (meta_ac) 1825 if (meta_ac)
1825 ocfs2_free_alloc_context(meta 1826 ocfs2_free_alloc_context(meta_ac);
1826 1827
1827 success: 1828 success:
1828 if (pagep) 1829 if (pagep)
1829 *pagep = wc->w_target_page; 1830 *pagep = wc->w_target_page;
1830 *fsdata = wc; 1831 *fsdata = wc;
1831 return 0; 1832 return 0;
1832 out_quota: 1833 out_quota:
1833 if (clusters_to_alloc) 1834 if (clusters_to_alloc)
1834 dquot_free_space(inode, 1835 dquot_free_space(inode,
1835 ocfs2_clusters_to_b 1836 ocfs2_clusters_to_bytes(osb->sb, clusters_to_alloc));
1836 out_commit: 1837 out_commit:
1837 ocfs2_commit_trans(osb, handle); 1838 ocfs2_commit_trans(osb, handle);
1838 1839
1839 out: 1840 out:
1840 /* 1841 /*
1841 * The mmapped page won't be unlocked 1842 * The mmapped page won't be unlocked in ocfs2_free_write_ctxt(),
1842 * even in case of error here like EN 1843 * even in case of error here like ENOSPC and ENOMEM. So, we need
1843 * to unlock the target page manually 1844 * to unlock the target page manually to prevent deadlocks when
1844 * retrying again on ENOSPC, or when 1845 * retrying again on ENOSPC, or when returning non-VM_FAULT_LOCKED
1845 * to VM code. 1846 * to VM code.
1846 */ 1847 */
1847 if (wc->w_target_locked) 1848 if (wc->w_target_locked)
1848 unlock_page(mmap_page); 1849 unlock_page(mmap_page);
1849 1850
1850 ocfs2_free_write_ctxt(inode, wc); 1851 ocfs2_free_write_ctxt(inode, wc);
1851 1852
1852 if (data_ac) { 1853 if (data_ac) {
1853 ocfs2_free_alloc_context(data 1854 ocfs2_free_alloc_context(data_ac);
1854 data_ac = NULL; 1855 data_ac = NULL;
1855 } 1856 }
1856 if (meta_ac) { 1857 if (meta_ac) {
1857 ocfs2_free_alloc_context(meta 1858 ocfs2_free_alloc_context(meta_ac);
1858 meta_ac = NULL; 1859 meta_ac = NULL;
1859 } 1860 }
1860 1861
1861 if (ret == -ENOSPC && try_free) { 1862 if (ret == -ENOSPC && try_free) {
1862 /* 1863 /*
1863 * Try to free some truncate 1864 * Try to free some truncate log so that we can have enough
1864 * clusters to allocate. 1865 * clusters to allocate.
1865 */ 1866 */
1866 try_free = 0; 1867 try_free = 0;
1867 1868
1868 ret1 = ocfs2_try_to_free_trun 1869 ret1 = ocfs2_try_to_free_truncate_log(osb, clusters_need);
1869 if (ret1 == 1) 1870 if (ret1 == 1)
1870 goto try_again; 1871 goto try_again;
1871 1872
1872 if (ret1 < 0) 1873 if (ret1 < 0)
1873 mlog_errno(ret1); 1874 mlog_errno(ret1);
1874 } 1875 }
1875 1876
1876 return ret; 1877 return ret;
1877 } 1878 }
1878 1879
1879 static int ocfs2_write_begin(struct file *fil 1880 static int ocfs2_write_begin(struct file *file, struct address_space *mapping,
1880 loff_t pos, unsi 1881 loff_t pos, unsigned len,
1881 struct page **pa 1882 struct page **pagep, void **fsdata)
1882 { 1883 {
1883 int ret; 1884 int ret;
1884 struct buffer_head *di_bh = NULL; 1885 struct buffer_head *di_bh = NULL;
1885 struct inode *inode = mapping->host; 1886 struct inode *inode = mapping->host;
1886 1887
1887 ret = ocfs2_inode_lock(inode, &di_bh, 1888 ret = ocfs2_inode_lock(inode, &di_bh, 1);
1888 if (ret) { 1889 if (ret) {
1889 mlog_errno(ret); 1890 mlog_errno(ret);
1890 return ret; 1891 return ret;
1891 } 1892 }
1892 1893
1893 /* 1894 /*
1894 * Take alloc sem here to prevent con 1895 * Take alloc sem here to prevent concurrent lookups. That way
1895 * the mapping, zeroing and tree mani 1896 * the mapping, zeroing and tree manipulation within
1896 * ocfs2_write() will be safe against 1897 * ocfs2_write() will be safe against ->read_folio(). This
1897 * should also serve to lock out allo 1898 * should also serve to lock out allocation from a shared
1898 * writeable region. 1899 * writeable region.
1899 */ 1900 */
1900 down_write(&OCFS2_I(inode)->ip_alloc_ 1901 down_write(&OCFS2_I(inode)->ip_alloc_sem);
1901 1902
1902 ret = ocfs2_write_begin_nolock(mappin 1903 ret = ocfs2_write_begin_nolock(mapping, pos, len, OCFS2_WRITE_BUFFER,
1903 pagep, 1904 pagep, fsdata, di_bh, NULL);
1904 if (ret) { 1905 if (ret) {
1905 mlog_errno(ret); 1906 mlog_errno(ret);
1906 goto out_fail; 1907 goto out_fail;
1907 } 1908 }
1908 1909
1909 brelse(di_bh); 1910 brelse(di_bh);
1910 1911
1911 return 0; 1912 return 0;
1912 1913
1913 out_fail: 1914 out_fail:
1914 up_write(&OCFS2_I(inode)->ip_alloc_se 1915 up_write(&OCFS2_I(inode)->ip_alloc_sem);
1915 1916
1916 brelse(di_bh); 1917 brelse(di_bh);
1917 ocfs2_inode_unlock(inode, 1); 1918 ocfs2_inode_unlock(inode, 1);
1918 1919
1919 return ret; 1920 return ret;
1920 } 1921 }
1921 1922
1922 static void ocfs2_write_end_inline(struct ino 1923 static void ocfs2_write_end_inline(struct inode *inode, loff_t pos,
1923 unsigned l 1924 unsigned len, unsigned *copied,
1924 struct ocf 1925 struct ocfs2_dinode *di,
1925 struct ocf 1926 struct ocfs2_write_ctxt *wc)
1926 { 1927 {
1927 void *kaddr; 1928 void *kaddr;
1928 1929
1929 if (unlikely(*copied < len)) { 1930 if (unlikely(*copied < len)) {
1930 if (!PageUptodate(wc->w_targe 1931 if (!PageUptodate(wc->w_target_page)) {
1931 *copied = 0; 1932 *copied = 0;
1932 return; 1933 return;
1933 } 1934 }
1934 } 1935 }
1935 1936
1936 kaddr = kmap_atomic(wc->w_target_page 1937 kaddr = kmap_atomic(wc->w_target_page);
1937 memcpy(di->id2.i_data.id_data + pos, 1938 memcpy(di->id2.i_data.id_data + pos, kaddr + pos, *copied);
1938 kunmap_atomic(kaddr); 1939 kunmap_atomic(kaddr);
1939 1940
1940 trace_ocfs2_write_end_inline( 1941 trace_ocfs2_write_end_inline(
1941 (unsigned long long)OCFS2_I(inod 1942 (unsigned long long)OCFS2_I(inode)->ip_blkno,
1942 (unsigned long long)pos, *copied 1943 (unsigned long long)pos, *copied,
1943 le16_to_cpu(di->id2.i_data.id_co 1944 le16_to_cpu(di->id2.i_data.id_count),
1944 le16_to_cpu(di->i_dyn_features)) 1945 le16_to_cpu(di->i_dyn_features));
1945 } 1946 }
1946 1947
1947 int ocfs2_write_end_nolock(struct address_spa 1948 int ocfs2_write_end_nolock(struct address_space *mapping,
1948 loff_t pos, unsign 1949 loff_t pos, unsigned len, unsigned copied, void *fsdata)
1949 { 1950 {
1950 int i, ret; 1951 int i, ret;
1951 unsigned from, to, start = pos & (PAG 1952 unsigned from, to, start = pos & (PAGE_SIZE - 1);
1952 struct inode *inode = mapping->host; 1953 struct inode *inode = mapping->host;
1953 struct ocfs2_super *osb = OCFS2_SB(in 1954 struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
1954 struct ocfs2_write_ctxt *wc = fsdata; 1955 struct ocfs2_write_ctxt *wc = fsdata;
1955 struct ocfs2_dinode *di = (struct ocf 1956 struct ocfs2_dinode *di = (struct ocfs2_dinode *)wc->w_di_bh->b_data;
1956 handle_t *handle = wc->w_handle; 1957 handle_t *handle = wc->w_handle;
1957 struct page *tmppage; 1958 struct page *tmppage;
1958 1959
1959 BUG_ON(!list_empty(&wc->w_unwritten_l 1960 BUG_ON(!list_empty(&wc->w_unwritten_list));
1960 1961
1961 if (handle) { 1962 if (handle) {
1962 ret = ocfs2_journal_access_di 1963 ret = ocfs2_journal_access_di(handle, INODE_CACHE(inode),
1963 wc->w_di_bh, 1964 wc->w_di_bh, OCFS2_JOURNAL_ACCESS_WRITE);
1964 if (ret) { 1965 if (ret) {
1965 copied = ret; 1966 copied = ret;
1966 mlog_errno(ret); 1967 mlog_errno(ret);
1967 goto out; 1968 goto out;
1968 } 1969 }
1969 } 1970 }
1970 1971
1971 if (OCFS2_I(inode)->ip_dyn_features & 1972 if (OCFS2_I(inode)->ip_dyn_features & OCFS2_INLINE_DATA_FL) {
1972 ocfs2_write_end_inline(inode, 1973 ocfs2_write_end_inline(inode, pos, len, &copied, di, wc);
1973 goto out_write_size; 1974 goto out_write_size;
1974 } 1975 }
1975 1976
1976 if (unlikely(copied < len) && wc->w_t 1977 if (unlikely(copied < len) && wc->w_target_page) {
1977 loff_t new_isize; 1978 loff_t new_isize;
1978 1979
1979 if (!PageUptodate(wc->w_targe 1980 if (!PageUptodate(wc->w_target_page))
1980 copied = 0; 1981 copied = 0;
1981 1982
1982 new_isize = max_t(loff_t, i_s 1983 new_isize = max_t(loff_t, i_size_read(inode), pos + copied);
1983 if (new_isize > page_offset(w 1984 if (new_isize > page_offset(wc->w_target_page))
1984 ocfs2_zero_new_buffer 1985 ocfs2_zero_new_buffers(wc->w_target_page, start+copied,
1985 1986 start+len);
1986 else { 1987 else {
1987 /* 1988 /*
1988 * When page is fully 1989 * When page is fully beyond new isize (data copy
1989 * failed), do not bo 1990 * failed), do not bother zeroing the page. Invalidate
1990 * it instead so that 1991 * it instead so that writeback does not get confused
1991 * put page & buffer 1992 * put page & buffer dirty bits into inconsistent
1992 * state. 1993 * state.
1993 */ 1994 */
1994 block_invalidate_foli 1995 block_invalidate_folio(page_folio(wc->w_target_page),
1995 1996 0, PAGE_SIZE);
1996 } 1997 }
1997 } 1998 }
1998 if (wc->w_target_page) 1999 if (wc->w_target_page)
1999 flush_dcache_page(wc->w_targe 2000 flush_dcache_page(wc->w_target_page);
2000 2001
2001 for(i = 0; i < wc->w_num_pages; i++) 2002 for(i = 0; i < wc->w_num_pages; i++) {
2002 tmppage = wc->w_pages[i]; 2003 tmppage = wc->w_pages[i];
2003 2004
2004 /* This is the direct io targ 2005 /* This is the direct io target page. */
2005 if (tmppage == NULL) 2006 if (tmppage == NULL)
2006 continue; 2007 continue;
2007 2008
2008 if (tmppage == wc->w_target_p 2009 if (tmppage == wc->w_target_page) {
2009 from = wc->w_target_f 2010 from = wc->w_target_from;
2010 to = wc->w_target_to; 2011 to = wc->w_target_to;
2011 2012
2012 BUG_ON(from > PAGE_SI 2013 BUG_ON(from > PAGE_SIZE ||
2013 to > PAGE_SIZE 2014 to > PAGE_SIZE ||
2014 to < from); 2015 to < from);
2015 } else { 2016 } else {
2016 /* 2017 /*
2017 * Pages adjacent to 2018 * Pages adjacent to the target (if any) imply
2018 * a hole-filling wri 2019 * a hole-filling write in which case we want
2019 * to flush their ent 2020 * to flush their entire range.
2020 */ 2021 */
2021 from = 0; 2022 from = 0;
2022 to = PAGE_SIZE; 2023 to = PAGE_SIZE;
2023 } 2024 }
2024 2025
2025 if (page_has_buffers(tmppage) 2026 if (page_has_buffers(tmppage)) {
2026 if (handle && ocfs2_s 2027 if (handle && ocfs2_should_order_data(inode)) {
2027 loff_t start_ 2028 loff_t start_byte =
2028 ((lof 2029 ((loff_t)tmppage->index << PAGE_SHIFT) +
2029 from; 2030 from;
2030 loff_t length 2031 loff_t length = to - from;
2031 ocfs2_jbd2_in 2032 ocfs2_jbd2_inode_add_write(handle, inode,
2032 2033 start_byte, length);
2033 } 2034 }
2034 block_commit_write(tm 2035 block_commit_write(tmppage, from, to);
2035 } 2036 }
2036 } 2037 }
2037 2038
2038 out_write_size: 2039 out_write_size:
2039 /* Direct io do not update i_size her 2040 /* Direct io do not update i_size here. */
2040 if (wc->w_type != OCFS2_WRITE_DIRECT) 2041 if (wc->w_type != OCFS2_WRITE_DIRECT) {
2041 pos += copied; 2042 pos += copied;
2042 if (pos > i_size_read(inode)) 2043 if (pos > i_size_read(inode)) {
2043 i_size_write(inode, p 2044 i_size_write(inode, pos);
2044 mark_inode_dirty(inod 2045 mark_inode_dirty(inode);
2045 } 2046 }
2046 inode->i_blocks = ocfs2_inode 2047 inode->i_blocks = ocfs2_inode_sector_count(inode);
2047 di->i_size = cpu_to_le64((u64 2048 di->i_size = cpu_to_le64((u64)i_size_read(inode));
2048 inode_set_mtime_to_ts(inode, 2049 inode_set_mtime_to_ts(inode, inode_set_ctime_current(inode));
2049 di->i_mtime = di->i_ctime = c 2050 di->i_mtime = di->i_ctime = cpu_to_le64(inode_get_mtime_sec(inode));
2050 di->i_mtime_nsec = di->i_ctim 2051 di->i_mtime_nsec = di->i_ctime_nsec = cpu_to_le32(inode_get_mtime_nsec(inode));
2051 if (handle) 2052 if (handle)
2052 ocfs2_update_inode_fs 2053 ocfs2_update_inode_fsync_trans(handle, inode, 1);
2053 } 2054 }
2054 if (handle) 2055 if (handle)
2055 ocfs2_journal_dirty(handle, w 2056 ocfs2_journal_dirty(handle, wc->w_di_bh);
2056 2057
2057 out: 2058 out:
2058 /* unlock pages before dealloc since 2059 /* unlock pages before dealloc since it needs acquiring j_trans_barrier
2059 * lock, or it will cause a deadlock 2060 * lock, or it will cause a deadlock since journal commit threads holds
2060 * this lock and will ask for the pag 2061 * this lock and will ask for the page lock when flushing the data.
2061 * put it here to preserve the unlock 2062 * put it here to preserve the unlock order.
2062 */ 2063 */
2063 ocfs2_unlock_pages(wc); 2064 ocfs2_unlock_pages(wc);
2064 2065
2065 if (handle) 2066 if (handle)
2066 ocfs2_commit_trans(osb, handl 2067 ocfs2_commit_trans(osb, handle);
2067 2068
2068 ocfs2_run_deallocs(osb, &wc->w_deallo 2069 ocfs2_run_deallocs(osb, &wc->w_dealloc);
2069 2070
2070 brelse(wc->w_di_bh); 2071 brelse(wc->w_di_bh);
2071 kfree(wc); 2072 kfree(wc);
2072 2073
2073 return copied; 2074 return copied;
2074 } 2075 }
2075 2076
2076 static int ocfs2_write_end(struct file *file, 2077 static int ocfs2_write_end(struct file *file, struct address_space *mapping,
2077 loff_t pos, unsign 2078 loff_t pos, unsigned len, unsigned copied,
2078 struct page *page, 2079 struct page *page, void *fsdata)
2079 { 2080 {
2080 int ret; 2081 int ret;
2081 struct inode *inode = mapping->host; 2082 struct inode *inode = mapping->host;
2082 2083
2083 ret = ocfs2_write_end_nolock(mapping, 2084 ret = ocfs2_write_end_nolock(mapping, pos, len, copied, fsdata);
2084 2085
2085 up_write(&OCFS2_I(inode)->ip_alloc_se 2086 up_write(&OCFS2_I(inode)->ip_alloc_sem);
2086 ocfs2_inode_unlock(inode, 1); 2087 ocfs2_inode_unlock(inode, 1);
2087 2088
2088 return ret; 2089 return ret;
2089 } 2090 }
2090 2091
2091 struct ocfs2_dio_write_ctxt { 2092 struct ocfs2_dio_write_ctxt {
2092 struct list_head dw_zero_list; 2093 struct list_head dw_zero_list;
2093 unsigned dw_zero_count 2094 unsigned dw_zero_count;
2094 int dw_orphaned; 2095 int dw_orphaned;
2095 pid_t dw_writer_pid 2096 pid_t dw_writer_pid;
2096 }; 2097 };
2097 2098
2098 static struct ocfs2_dio_write_ctxt * 2099 static struct ocfs2_dio_write_ctxt *
2099 ocfs2_dio_alloc_write_ctx(struct buffer_head 2100 ocfs2_dio_alloc_write_ctx(struct buffer_head *bh, int *alloc)
2100 { 2101 {
2101 struct ocfs2_dio_write_ctxt *dwc = NU 2102 struct ocfs2_dio_write_ctxt *dwc = NULL;
2102 2103
2103 if (bh->b_private) 2104 if (bh->b_private)
2104 return bh->b_private; 2105 return bh->b_private;
2105 2106
2106 dwc = kmalloc(sizeof(struct ocfs2_dio 2107 dwc = kmalloc(sizeof(struct ocfs2_dio_write_ctxt), GFP_NOFS);
2107 if (dwc == NULL) 2108 if (dwc == NULL)
2108 return NULL; 2109 return NULL;
2109 INIT_LIST_HEAD(&dwc->dw_zero_list); 2110 INIT_LIST_HEAD(&dwc->dw_zero_list);
2110 dwc->dw_zero_count = 0; 2111 dwc->dw_zero_count = 0;
2111 dwc->dw_orphaned = 0; 2112 dwc->dw_orphaned = 0;
2112 dwc->dw_writer_pid = task_pid_nr(curr 2113 dwc->dw_writer_pid = task_pid_nr(current);
2113 bh->b_private = dwc; 2114 bh->b_private = dwc;
2114 *alloc = 1; 2115 *alloc = 1;
2115 2116
2116 return dwc; 2117 return dwc;
2117 } 2118 }
2118 2119
2119 static void ocfs2_dio_free_write_ctx(struct i 2120 static void ocfs2_dio_free_write_ctx(struct inode *inode,
2120 struct o 2121 struct ocfs2_dio_write_ctxt *dwc)
2121 { 2122 {
2122 ocfs2_free_unwritten_list(inode, &dwc 2123 ocfs2_free_unwritten_list(inode, &dwc->dw_zero_list);
2123 kfree(dwc); 2124 kfree(dwc);
2124 } 2125 }
2125 2126
2126 /* 2127 /*
2127 * TODO: Make this into a generic get_blocks 2128 * TODO: Make this into a generic get_blocks function.
2128 * 2129 *
2129 * From do_direct_io in direct-io.c: 2130 * From do_direct_io in direct-io.c:
2130 * "So what we do is to permit the ->get_blo 2131 * "So what we do is to permit the ->get_blocks function to populate
2131 * bh.b_size with the size of IO which is p 2132 * bh.b_size with the size of IO which is permitted at this offset and
2132 * this i_blkbits." 2133 * this i_blkbits."
2133 * 2134 *
2134 * This function is called directly from get_ 2135 * This function is called directly from get_more_blocks in direct-io.c.
2135 * 2136 *
2136 * called like this: dio->get_blocks(dio->ino 2137 * called like this: dio->get_blocks(dio->inode, fs_startblk,
2137 * fs_co 2138 * fs_count, map_bh, dio->rw == WRITE);
2138 */ 2139 */
2139 static int ocfs2_dio_wr_get_block(struct inod 2140 static int ocfs2_dio_wr_get_block(struct inode *inode, sector_t iblock,
2140 struct buffer_ 2141 struct buffer_head *bh_result, int create)
2141 { 2142 {
2142 struct ocfs2_super *osb = OCFS2_SB(in 2143 struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
2143 struct ocfs2_inode_info *oi = OCFS2_I 2144 struct ocfs2_inode_info *oi = OCFS2_I(inode);
2144 struct ocfs2_write_ctxt *wc; 2145 struct ocfs2_write_ctxt *wc;
2145 struct ocfs2_write_cluster_desc *desc 2146 struct ocfs2_write_cluster_desc *desc = NULL;
2146 struct ocfs2_dio_write_ctxt *dwc = NU 2147 struct ocfs2_dio_write_ctxt *dwc = NULL;
2147 struct buffer_head *di_bh = NULL; 2148 struct buffer_head *di_bh = NULL;
2148 u64 p_blkno; 2149 u64 p_blkno;
2149 unsigned int i_blkbits = inode->i_sb- 2150 unsigned int i_blkbits = inode->i_sb->s_blocksize_bits;
2150 loff_t pos = iblock << i_blkbits; 2151 loff_t pos = iblock << i_blkbits;
2151 sector_t endblk = (i_size_read(inode) 2152 sector_t endblk = (i_size_read(inode) - 1) >> i_blkbits;
2152 unsigned len, total_len = bh_result-> 2153 unsigned len, total_len = bh_result->b_size;
2153 int ret = 0, first_get_block = 0; 2154 int ret = 0, first_get_block = 0;
2154 2155
2155 len = osb->s_clustersize - (pos & (os 2156 len = osb->s_clustersize - (pos & (osb->s_clustersize - 1));
2156 len = min(total_len, len); 2157 len = min(total_len, len);
2157 2158
2158 /* 2159 /*
2159 * bh_result->b_size is count in get_ 2160 * bh_result->b_size is count in get_more_blocks according to write
2160 * "pos" and "end", we need map twice 2161 * "pos" and "end", we need map twice to return different buffer state:
2161 * 1. area in file size, not set NEW; 2162 * 1. area in file size, not set NEW;
2162 * 2. area out file size, set NEW. 2163 * 2. area out file size, set NEW.
2163 * 2164 *
2164 * iblock endblk 2165 * iblock endblk
2165 * |--------|---------|---------|---- 2166 * |--------|---------|---------|---------
2166 * |<-------area in file------->| 2167 * |<-------area in file------->|
2167 */ 2168 */
2168 2169
2169 if ((iblock <= endblk) && 2170 if ((iblock <= endblk) &&
2170 ((iblock + ((len - 1) >> i_blkbit 2171 ((iblock + ((len - 1) >> i_blkbits)) > endblk))
2171 len = (endblk - iblock + 1) < 2172 len = (endblk - iblock + 1) << i_blkbits;
2172 2173
2173 mlog(0, "get block of %lu at %llu:%u 2174 mlog(0, "get block of %lu at %llu:%u req %u\n",
2174 inode->i_ino, pos, le 2175 inode->i_ino, pos, len, total_len);
2175 2176
2176 /* 2177 /*
2177 * Because we need to change file siz 2178 * Because we need to change file size in ocfs2_dio_end_io_write(), or
2178 * we may need to add it to orphan di 2179 * we may need to add it to orphan dir. So can not fall to fast path
2179 * while file size will be changed. 2180 * while file size will be changed.
2180 */ 2181 */
2181 if (pos + total_len <= i_size_read(in 2182 if (pos + total_len <= i_size_read(inode)) {
2182 2183
2183 /* This is the fast path for 2184 /* This is the fast path for re-write. */
2184 ret = ocfs2_lock_get_block(in 2185 ret = ocfs2_lock_get_block(inode, iblock, bh_result, create);
2185 if (buffer_mapped(bh_result) 2186 if (buffer_mapped(bh_result) &&
2186 !buffer_new(bh_result) && 2187 !buffer_new(bh_result) &&
2187 ret == 0) 2188 ret == 0)
2188 goto out; 2189 goto out;
2189 2190
2190 /* Clear state set by ocfs2_g 2191 /* Clear state set by ocfs2_get_block. */
2191 bh_result->b_state = 0; 2192 bh_result->b_state = 0;
2192 } 2193 }
2193 2194
2194 dwc = ocfs2_dio_alloc_write_ctx(bh_re 2195 dwc = ocfs2_dio_alloc_write_ctx(bh_result, &first_get_block);
2195 if (unlikely(dwc == NULL)) { 2196 if (unlikely(dwc == NULL)) {
2196 ret = -ENOMEM; 2197 ret = -ENOMEM;
2197 mlog_errno(ret); 2198 mlog_errno(ret);
2198 goto out; 2199 goto out;
2199 } 2200 }
2200 2201
2201 if (ocfs2_clusters_for_bytes(inode->i 2202 if (ocfs2_clusters_for_bytes(inode->i_sb, pos + total_len) >
2202 ocfs2_clusters_for_bytes(inode->i 2203 ocfs2_clusters_for_bytes(inode->i_sb, i_size_read(inode)) &&
2203 !dwc->dw_orphaned) { 2204 !dwc->dw_orphaned) {
2204 /* 2205 /*
2205 * when we are going to alloc 2206 * when we are going to alloc extents beyond file size, add the
2206 * inode to orphan dir, so we 2207 * inode to orphan dir, so we can recall those spaces when
2207 * system crashed during writ 2208 * system crashed during write.
2208 */ 2209 */
2209 ret = ocfs2_add_inode_to_orph 2210 ret = ocfs2_add_inode_to_orphan(osb, inode);
2210 if (ret < 0) { 2211 if (ret < 0) {
2211 mlog_errno(ret); 2212 mlog_errno(ret);
2212 goto out; 2213 goto out;
2213 } 2214 }
2214 dwc->dw_orphaned = 1; 2215 dwc->dw_orphaned = 1;
2215 } 2216 }
2216 2217
2217 ret = ocfs2_inode_lock(inode, &di_bh, 2218 ret = ocfs2_inode_lock(inode, &di_bh, 1);
2218 if (ret) { 2219 if (ret) {
2219 mlog_errno(ret); 2220 mlog_errno(ret);
2220 goto out; 2221 goto out;
2221 } 2222 }
2222 2223
2223 down_write(&oi->ip_alloc_sem); 2224 down_write(&oi->ip_alloc_sem);
2224 2225
2225 if (first_get_block) { 2226 if (first_get_block) {
2226 if (ocfs2_sparse_alloc(osb)) 2227 if (ocfs2_sparse_alloc(osb))
2227 ret = ocfs2_zero_tail 2228 ret = ocfs2_zero_tail(inode, di_bh, pos);
2228 else 2229 else
2229 ret = ocfs2_expand_no 2230 ret = ocfs2_expand_nonsparse_inode(inode, di_bh, pos,
2230 2231 total_len, NULL);
2231 if (ret < 0) { 2232 if (ret < 0) {
2232 mlog_errno(ret); 2233 mlog_errno(ret);
2233 goto unlock; 2234 goto unlock;
2234 } 2235 }
2235 } 2236 }
2236 2237
2237 ret = ocfs2_write_begin_nolock(inode- 2238 ret = ocfs2_write_begin_nolock(inode->i_mapping, pos, len,
2238 OCFS2_ 2239 OCFS2_WRITE_DIRECT, NULL,
2239 (void 2240 (void **)&wc, di_bh, NULL);
2240 if (ret) { 2241 if (ret) {
2241 mlog_errno(ret); 2242 mlog_errno(ret);
2242 goto unlock; 2243 goto unlock;
2243 } 2244 }
2244 2245
2245 desc = &wc->w_desc[0]; 2246 desc = &wc->w_desc[0];
2246 2247
2247 p_blkno = ocfs2_clusters_to_blocks(in 2248 p_blkno = ocfs2_clusters_to_blocks(inode->i_sb, desc->c_phys);
2248 BUG_ON(p_blkno == 0); 2249 BUG_ON(p_blkno == 0);
2249 p_blkno += iblock & (u64)(ocfs2_clust 2250 p_blkno += iblock & (u64)(ocfs2_clusters_to_blocks(inode->i_sb, 1) - 1);
2250 2251
2251 map_bh(bh_result, inode->i_sb, p_blkn 2252 map_bh(bh_result, inode->i_sb, p_blkno);
2252 bh_result->b_size = len; 2253 bh_result->b_size = len;
2253 if (desc->c_needs_zero) 2254 if (desc->c_needs_zero)
2254 set_buffer_new(bh_result); 2255 set_buffer_new(bh_result);
2255 2256
2256 if (iblock > endblk) 2257 if (iblock > endblk)
2257 set_buffer_new(bh_result); 2258 set_buffer_new(bh_result);
2258 2259
2259 /* May sleep in end_io. It should not 2260 /* May sleep in end_io. It should not happen in a irq context. So defer
2260 * it to dio work queue. */ 2261 * it to dio work queue. */
2261 set_buffer_defer_completion(bh_result 2262 set_buffer_defer_completion(bh_result);
2262 2263
2263 if (!list_empty(&wc->w_unwritten_list 2264 if (!list_empty(&wc->w_unwritten_list)) {
2264 struct ocfs2_unwritten_extent 2265 struct ocfs2_unwritten_extent *ue = NULL;
2265 2266
2266 ue = list_first_entry(&wc->w_ 2267 ue = list_first_entry(&wc->w_unwritten_list,
2267 struct 2268 struct ocfs2_unwritten_extent,
2268 ue_node 2269 ue_node);
2269 BUG_ON(ue->ue_cpos != desc->c 2270 BUG_ON(ue->ue_cpos != desc->c_cpos);
2270 /* The physical address may b 2271 /* The physical address may be 0, fill it. */
2271 ue->ue_phys = desc->c_phys; 2272 ue->ue_phys = desc->c_phys;
2272 2273
2273 list_splice_tail_init(&wc->w_ 2274 list_splice_tail_init(&wc->w_unwritten_list, &dwc->dw_zero_list);
2274 dwc->dw_zero_count += wc->w_u 2275 dwc->dw_zero_count += wc->w_unwritten_count;
2275 } 2276 }
2276 2277
2277 ret = ocfs2_write_end_nolock(inode->i 2278 ret = ocfs2_write_end_nolock(inode->i_mapping, pos, len, len, wc);
2278 BUG_ON(ret != len); 2279 BUG_ON(ret != len);
2279 ret = 0; 2280 ret = 0;
2280 unlock: 2281 unlock:
2281 up_write(&oi->ip_alloc_sem); 2282 up_write(&oi->ip_alloc_sem);
2282 ocfs2_inode_unlock(inode, 1); 2283 ocfs2_inode_unlock(inode, 1);
2283 brelse(di_bh); 2284 brelse(di_bh);
2284 out: 2285 out:
>> 2286 if (ret < 0)
>> 2287 ret = -EIO;
2285 return ret; 2288 return ret;
2286 } 2289 }
2287 2290
2288 static int ocfs2_dio_end_io_write(struct inod 2291 static int ocfs2_dio_end_io_write(struct inode *inode,
2289 struct ocfs 2292 struct ocfs2_dio_write_ctxt *dwc,
2290 loff_t offs 2293 loff_t offset,
2291 ssize_t byt 2294 ssize_t bytes)
2292 { 2295 {
2293 struct ocfs2_cached_dealloc_ctxt deal 2296 struct ocfs2_cached_dealloc_ctxt dealloc;
2294 struct ocfs2_extent_tree et; 2297 struct ocfs2_extent_tree et;
2295 struct ocfs2_super *osb = OCFS2_SB(in 2298 struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
2296 struct ocfs2_inode_info *oi = OCFS2_I 2299 struct ocfs2_inode_info *oi = OCFS2_I(inode);
2297 struct ocfs2_unwritten_extent *ue = N 2300 struct ocfs2_unwritten_extent *ue = NULL;
2298 struct buffer_head *di_bh = NULL; 2301 struct buffer_head *di_bh = NULL;
2299 struct ocfs2_dinode *di; 2302 struct ocfs2_dinode *di;
2300 struct ocfs2_alloc_context *data_ac = 2303 struct ocfs2_alloc_context *data_ac = NULL;
2301 struct ocfs2_alloc_context *meta_ac = 2304 struct ocfs2_alloc_context *meta_ac = NULL;
2302 handle_t *handle = NULL; 2305 handle_t *handle = NULL;
2303 loff_t end = offset + bytes; 2306 loff_t end = offset + bytes;
2304 int ret = 0, credits = 0; 2307 int ret = 0, credits = 0;
2305 2308
2306 ocfs2_init_dealloc_ctxt(&dealloc); 2309 ocfs2_init_dealloc_ctxt(&dealloc);
2307 2310
2308 /* We do clear unwritten, delete orph 2311 /* We do clear unwritten, delete orphan, change i_size here. If neither
2309 * of these happen, we can skip all t 2312 * of these happen, we can skip all this. */
2310 if (list_empty(&dwc->dw_zero_list) && 2313 if (list_empty(&dwc->dw_zero_list) &&
2311 end <= i_size_read(inode) && 2314 end <= i_size_read(inode) &&
2312 !dwc->dw_orphaned) 2315 !dwc->dw_orphaned)
2313 goto out; 2316 goto out;
2314 2317
2315 ret = ocfs2_inode_lock(inode, &di_bh, 2318 ret = ocfs2_inode_lock(inode, &di_bh, 1);
2316 if (ret < 0) { 2319 if (ret < 0) {
2317 mlog_errno(ret); 2320 mlog_errno(ret);
2318 goto out; 2321 goto out;
2319 } 2322 }
2320 2323
2321 down_write(&oi->ip_alloc_sem); 2324 down_write(&oi->ip_alloc_sem);
2322 2325
2323 /* Delete orphan before acquire i_rws 2326 /* Delete orphan before acquire i_rwsem. */
2324 if (dwc->dw_orphaned) { 2327 if (dwc->dw_orphaned) {
2325 BUG_ON(dwc->dw_writer_pid != 2328 BUG_ON(dwc->dw_writer_pid != task_pid_nr(current));
2326 2329
2327 end = end > i_size_read(inode 2330 end = end > i_size_read(inode) ? end : 0;
2328 2331
2329 ret = ocfs2_del_inode_from_or 2332 ret = ocfs2_del_inode_from_orphan(osb, inode, di_bh,
2330 !!end, end); 2333 !!end, end);
2331 if (ret < 0) 2334 if (ret < 0)
2332 mlog_errno(ret); 2335 mlog_errno(ret);
2333 } 2336 }
2334 2337
2335 di = (struct ocfs2_dinode *)di_bh->b_ 2338 di = (struct ocfs2_dinode *)di_bh->b_data;
2336 2339
2337 ocfs2_init_dinode_extent_tree(&et, IN 2340 ocfs2_init_dinode_extent_tree(&et, INODE_CACHE(inode), di_bh);
2338 2341
2339 /* Attach dealloc with extent tree in 2342 /* Attach dealloc with extent tree in case that we may reuse extents
2340 * which are already unlinked from cu 2343 * which are already unlinked from current extent tree due to extent
2341 * rotation and merging. 2344 * rotation and merging.
2342 */ 2345 */
2343 et.et_dealloc = &dealloc; 2346 et.et_dealloc = &dealloc;
2344 2347
2345 ret = ocfs2_lock_allocators(inode, &e 2348 ret = ocfs2_lock_allocators(inode, &et, 0, dwc->dw_zero_count*2,
2346 &data_ac, 2349 &data_ac, &meta_ac);
2347 if (ret) { 2350 if (ret) {
2348 mlog_errno(ret); 2351 mlog_errno(ret);
2349 goto unlock; 2352 goto unlock;
2350 } 2353 }
2351 2354
2352 credits = ocfs2_calc_extend_credits(i 2355 credits = ocfs2_calc_extend_credits(inode->i_sb, &di->id2.i_list);
2353 2356
2354 handle = ocfs2_start_trans(osb, credi 2357 handle = ocfs2_start_trans(osb, credits);
2355 if (IS_ERR(handle)) { 2358 if (IS_ERR(handle)) {
2356 ret = PTR_ERR(handle); 2359 ret = PTR_ERR(handle);
2357 mlog_errno(ret); 2360 mlog_errno(ret);
2358 goto unlock; 2361 goto unlock;
2359 } 2362 }
2360 ret = ocfs2_journal_access_di(handle, 2363 ret = ocfs2_journal_access_di(handle, INODE_CACHE(inode), di_bh,
2361 OCFS2_J 2364 OCFS2_JOURNAL_ACCESS_WRITE);
2362 if (ret) { 2365 if (ret) {
2363 mlog_errno(ret); 2366 mlog_errno(ret);
2364 goto commit; 2367 goto commit;
2365 } 2368 }
2366 2369
2367 list_for_each_entry(ue, &dwc->dw_zero 2370 list_for_each_entry(ue, &dwc->dw_zero_list, ue_node) {
2368 ret = ocfs2_assure_trans_cred <<
2369 if (ret < 0) { <<
2370 mlog_errno(ret); <<
2371 break; <<
2372 } <<
2373 ret = ocfs2_mark_extent_writt 2371 ret = ocfs2_mark_extent_written(inode, &et, handle,
2374 2372 ue->ue_cpos, 1,
2375 2373 ue->ue_phys,
2376 2374 meta_ac, &dealloc);
2377 if (ret < 0) { 2375 if (ret < 0) {
2378 mlog_errno(ret); 2376 mlog_errno(ret);
2379 break; 2377 break;
2380 } 2378 }
2381 } 2379 }
2382 2380
2383 if (end > i_size_read(inode)) { 2381 if (end > i_size_read(inode)) {
2384 ret = ocfs2_set_inode_size(ha 2382 ret = ocfs2_set_inode_size(handle, inode, di_bh, end);
2385 if (ret < 0) 2383 if (ret < 0)
2386 mlog_errno(ret); 2384 mlog_errno(ret);
2387 } 2385 }
2388 commit: 2386 commit:
2389 ocfs2_commit_trans(osb, handle); 2387 ocfs2_commit_trans(osb, handle);
2390 unlock: 2388 unlock:
2391 up_write(&oi->ip_alloc_sem); 2389 up_write(&oi->ip_alloc_sem);
2392 ocfs2_inode_unlock(inode, 1); 2390 ocfs2_inode_unlock(inode, 1);
2393 brelse(di_bh); 2391 brelse(di_bh);
2394 out: 2392 out:
2395 if (data_ac) 2393 if (data_ac)
2396 ocfs2_free_alloc_context(data 2394 ocfs2_free_alloc_context(data_ac);
2397 if (meta_ac) 2395 if (meta_ac)
2398 ocfs2_free_alloc_context(meta 2396 ocfs2_free_alloc_context(meta_ac);
2399 ocfs2_run_deallocs(osb, &dealloc); 2397 ocfs2_run_deallocs(osb, &dealloc);
2400 ocfs2_dio_free_write_ctx(inode, dwc); 2398 ocfs2_dio_free_write_ctx(inode, dwc);
2401 2399
2402 return ret; 2400 return ret;
2403 } 2401 }
2404 2402
2405 /* 2403 /*
2406 * ocfs2_dio_end_io is called by the dio core 2404 * ocfs2_dio_end_io is called by the dio core when a dio is finished. We're
2407 * particularly interested in the aio/dio cas 2405 * particularly interested in the aio/dio case. We use the rw_lock DLM lock
2408 * to protect io on one node from truncation 2406 * to protect io on one node from truncation on another.
2409 */ 2407 */
2410 static int ocfs2_dio_end_io(struct kiocb *ioc 2408 static int ocfs2_dio_end_io(struct kiocb *iocb,
2411 loff_t offset, 2409 loff_t offset,
2412 ssize_t bytes, 2410 ssize_t bytes,
2413 void *private) 2411 void *private)
2414 { 2412 {
2415 struct inode *inode = file_inode(iocb 2413 struct inode *inode = file_inode(iocb->ki_filp);
2416 int level; 2414 int level;
2417 int ret = 0; 2415 int ret = 0;
2418 2416
2419 /* this io's submitter should not hav 2417 /* this io's submitter should not have unlocked this before we could */
2420 BUG_ON(!ocfs2_iocb_is_rw_locked(iocb) 2418 BUG_ON(!ocfs2_iocb_is_rw_locked(iocb));
2421 2419
2422 if (bytes <= 0) 2420 if (bytes <= 0)
2423 mlog_ratelimited(ML_ERROR, "D 2421 mlog_ratelimited(ML_ERROR, "Direct IO failed, bytes = %lld",
2424 (long long)b 2422 (long long)bytes);
2425 if (private) { 2423 if (private) {
2426 if (bytes > 0) 2424 if (bytes > 0)
2427 ret = ocfs2_dio_end_i 2425 ret = ocfs2_dio_end_io_write(inode, private, offset,
2428 2426 bytes);
2429 else 2427 else
2430 ocfs2_dio_free_write_ 2428 ocfs2_dio_free_write_ctx(inode, private);
2431 } 2429 }
2432 2430
2433 ocfs2_iocb_clear_rw_locked(iocb); 2431 ocfs2_iocb_clear_rw_locked(iocb);
2434 2432
2435 level = ocfs2_iocb_rw_locked_level(io 2433 level = ocfs2_iocb_rw_locked_level(iocb);
2436 ocfs2_rw_unlock(inode, level); 2434 ocfs2_rw_unlock(inode, level);
2437 return ret; 2435 return ret;
2438 } 2436 }
2439 2437
2440 static ssize_t ocfs2_direct_IO(struct kiocb * 2438 static ssize_t ocfs2_direct_IO(struct kiocb *iocb, struct iov_iter *iter)
2441 { 2439 {
2442 struct file *file = iocb->ki_filp; 2440 struct file *file = iocb->ki_filp;
2443 struct inode *inode = file->f_mapping 2441 struct inode *inode = file->f_mapping->host;
2444 struct ocfs2_super *osb = OCFS2_SB(in 2442 struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
2445 get_block_t *get_block; 2443 get_block_t *get_block;
2446 2444
2447 /* 2445 /*
2448 * Fallback to buffered I/O if we see 2446 * Fallback to buffered I/O if we see an inode without
2449 * extents. 2447 * extents.
2450 */ 2448 */
2451 if (OCFS2_I(inode)->ip_dyn_features & 2449 if (OCFS2_I(inode)->ip_dyn_features & OCFS2_INLINE_DATA_FL)
2452 return 0; 2450 return 0;
2453 2451
2454 /* Fallback to buffered I/O if we do 2452 /* Fallback to buffered I/O if we do not support append dio. */
2455 if (iocb->ki_pos + iter->count > i_si 2453 if (iocb->ki_pos + iter->count > i_size_read(inode) &&
2456 !ocfs2_supports_append_dio(osb)) 2454 !ocfs2_supports_append_dio(osb))
2457 return 0; 2455 return 0;
2458 2456
2459 if (iov_iter_rw(iter) == READ) 2457 if (iov_iter_rw(iter) == READ)
2460 get_block = ocfs2_lock_get_bl 2458 get_block = ocfs2_lock_get_block;
2461 else 2459 else
2462 get_block = ocfs2_dio_wr_get_ 2460 get_block = ocfs2_dio_wr_get_block;
2463 2461
2464 return __blockdev_direct_IO(iocb, ino 2462 return __blockdev_direct_IO(iocb, inode, inode->i_sb->s_bdev,
2465 iter, get 2463 iter, get_block,
2466 ocfs2_dio 2464 ocfs2_dio_end_io, 0);
2467 } 2465 }
2468 2466
2469 const struct address_space_operations ocfs2_a 2467 const struct address_space_operations ocfs2_aops = {
2470 .dirty_folio = block_dirty 2468 .dirty_folio = block_dirty_folio,
2471 .read_folio = ocfs2_read_ 2469 .read_folio = ocfs2_read_folio,
2472 .readahead = ocfs2_reada 2470 .readahead = ocfs2_readahead,
2473 .writepages = ocfs2_write 2471 .writepages = ocfs2_writepages,
2474 .write_begin = ocfs2_write 2472 .write_begin = ocfs2_write_begin,
2475 .write_end = ocfs2_write 2473 .write_end = ocfs2_write_end,
2476 .bmap = ocfs2_bmap, 2474 .bmap = ocfs2_bmap,
2477 .direct_IO = ocfs2_direc 2475 .direct_IO = ocfs2_direct_IO,
2478 .invalidate_folio = block_inval 2476 .invalidate_folio = block_invalidate_folio,
2479 .release_folio = ocfs2_relea 2477 .release_folio = ocfs2_release_folio,
2480 .migrate_folio = buffer_migr 2478 .migrate_folio = buffer_migrate_folio,
2481 .is_partially_uptodate = block_is_pa 2479 .is_partially_uptodate = block_is_partially_uptodate,
2482 .error_remove_folio = generic_err 2480 .error_remove_folio = generic_error_remove_folio,
2483 }; 2481 };
2484 2482
Linux® is a registered trademark of Linus Torvalds in the United States and other countries.
TOMOYO® is a registered trademark of NTT DATA CORPORATION.