Diff markup
1 /* 1 /*
2 * linux/fs/affs/file.c 2 * linux/fs/affs/file.c
3 * 3 *
4 * (c) 1996 Hans-Joachim Widmaier - Rewritte 4 * (c) 1996 Hans-Joachim Widmaier - Rewritten
5 * 5 *
6 * (C) 1993 Ray Burr - Modified for Amiga FF 6 * (C) 1993 Ray Burr - Modified for Amiga FFS filesystem.
7 * 7 *
8 * (C) 1992 Eric Youngdale Modified for ISO 8 * (C) 1992 Eric Youngdale Modified for ISO 9660 filesystem.
9 * 9 *
10 * (C) 1991 Linus Torvalds - minix filesyste 10 * (C) 1991 Linus Torvalds - minix filesystem
11 * 11 *
12 * affs regular file handling primitives 12 * affs regular file handling primitives
13 */ 13 */
14 14
15 #include "affs.h" 15 #include "affs.h"
16 16
17 #if PAGE_SIZE < 4096 17 #if PAGE_SIZE < 4096
18 #error PAGE_SIZE must be at least 4096 18 #error PAGE_SIZE must be at least 4096
19 #endif 19 #endif
20 20
21 static int affs_grow_extcache(struct inode *in 21 static int affs_grow_extcache(struct inode *inode, u32 lc_idx);
22 static struct buffer_head *affs_alloc_extblock 22 static struct buffer_head *affs_alloc_extblock(struct inode *inode, struct buffer_head *bh, u32 ext);
23 static inline struct buffer_head *affs_get_ext 23 static inline struct buffer_head *affs_get_extblock(struct inode *inode, u32 ext);
24 static struct buffer_head *affs_get_extblock_s 24 static struct buffer_head *affs_get_extblock_slow(struct inode *inode, u32 ext);
25 static int affs_file_open(struct inode *inode, 25 static int affs_file_open(struct inode *inode, struct file *filp);
26 static int affs_file_release(struct inode *ino 26 static int affs_file_release(struct inode *inode, struct file *filp);
27 27
28 const struct file_operations affs_file_operati 28 const struct file_operations affs_file_operations = {
29 .llseek = generic_file_llseek, 29 .llseek = generic_file_llseek,
30 .read = do_sync_read, 30 .read = do_sync_read,
31 .aio_read = generic_file_aio_rea 31 .aio_read = generic_file_aio_read,
32 .write = do_sync_write, 32 .write = do_sync_write,
33 .aio_write = generic_file_aio_wri 33 .aio_write = generic_file_aio_write,
34 .mmap = generic_file_mmap, 34 .mmap = generic_file_mmap,
35 .open = affs_file_open, 35 .open = affs_file_open,
36 .release = affs_file_release, 36 .release = affs_file_release,
37 .fsync = file_fsync, 37 .fsync = file_fsync,
38 .splice_read = generic_file_splice_ 38 .splice_read = generic_file_splice_read,
39 }; 39 };
40 40
41 const struct inode_operations affs_file_inode_ 41 const struct inode_operations affs_file_inode_operations = {
42 .truncate = affs_truncate, 42 .truncate = affs_truncate,
43 .setattr = affs_notify_change, 43 .setattr = affs_notify_change,
44 }; 44 };
45 45
46 static int 46 static int
47 affs_file_open(struct inode *inode, struct fil 47 affs_file_open(struct inode *inode, struct file *filp)
48 { 48 {
49 if (atomic_read(&filp->f_count) != 1) 49 if (atomic_read(&filp->f_count) != 1)
50 return 0; 50 return 0;
51 pr_debug("AFFS: open(%d)\n", AFFS_I(in 51 pr_debug("AFFS: open(%d)\n", AFFS_I(inode)->i_opencnt);
52 AFFS_I(inode)->i_opencnt++; 52 AFFS_I(inode)->i_opencnt++;
53 return 0; 53 return 0;
54 } 54 }
55 55
56 static int 56 static int
57 affs_file_release(struct inode *inode, struct 57 affs_file_release(struct inode *inode, struct file *filp)
58 { 58 {
59 if (atomic_read(&filp->f_count) != 0) 59 if (atomic_read(&filp->f_count) != 0)
60 return 0; 60 return 0;
61 pr_debug("AFFS: release(%d)\n", AFFS_I 61 pr_debug("AFFS: release(%d)\n", AFFS_I(inode)->i_opencnt);
62 AFFS_I(inode)->i_opencnt--; 62 AFFS_I(inode)->i_opencnt--;
63 if (!AFFS_I(inode)->i_opencnt) 63 if (!AFFS_I(inode)->i_opencnt)
64 affs_free_prealloc(inode); 64 affs_free_prealloc(inode);
65 65
66 return 0; 66 return 0;
67 } 67 }
68 68
69 static int 69 static int
70 affs_grow_extcache(struct inode *inode, u32 lc 70 affs_grow_extcache(struct inode *inode, u32 lc_idx)
71 { 71 {
72 struct super_block *sb = inode->i 72 struct super_block *sb = inode->i_sb;
73 struct buffer_head *bh; 73 struct buffer_head *bh;
74 u32 lc_max; 74 u32 lc_max;
75 int i, j, key; 75 int i, j, key;
76 76
77 if (!AFFS_I(inode)->i_lc) { 77 if (!AFFS_I(inode)->i_lc) {
78 char *ptr = (char *)get_zeroed 78 char *ptr = (char *)get_zeroed_page(GFP_NOFS);
79 if (!ptr) 79 if (!ptr)
80 return -ENOMEM; 80 return -ENOMEM;
81 AFFS_I(inode)->i_lc = (u32 *)p 81 AFFS_I(inode)->i_lc = (u32 *)ptr;
82 AFFS_I(inode)->i_ac = (struct 82 AFFS_I(inode)->i_ac = (struct affs_ext_key *)(ptr + AFFS_CACHE_SIZE / 2);
83 } 83 }
84 84
85 lc_max = AFFS_LC_SIZE << AFFS_I(inode) 85 lc_max = AFFS_LC_SIZE << AFFS_I(inode)->i_lc_shift;
86 86
87 if (AFFS_I(inode)->i_extcnt > lc_max) 87 if (AFFS_I(inode)->i_extcnt > lc_max) {
88 u32 lc_shift, lc_mask, tmp, of 88 u32 lc_shift, lc_mask, tmp, off;
89 89
90 /* need to recalculate linear 90 /* need to recalculate linear cache, start from old size */
91 lc_shift = AFFS_I(inode)->i_lc 91 lc_shift = AFFS_I(inode)->i_lc_shift;
92 tmp = (AFFS_I(inode)->i_extcnt 92 tmp = (AFFS_I(inode)->i_extcnt / AFFS_LC_SIZE) >> lc_shift;
93 for (; tmp; tmp >>= 1) 93 for (; tmp; tmp >>= 1)
94 lc_shift++; 94 lc_shift++;
95 lc_mask = (1 << lc_shift) - 1; 95 lc_mask = (1 << lc_shift) - 1;
96 96
97 /* fix idx and old size to new 97 /* fix idx and old size to new shift */
98 lc_idx >>= (lc_shift - AFFS_I( 98 lc_idx >>= (lc_shift - AFFS_I(inode)->i_lc_shift);
99 AFFS_I(inode)->i_lc_size >>= ( 99 AFFS_I(inode)->i_lc_size >>= (lc_shift - AFFS_I(inode)->i_lc_shift);
100 100
101 /* first shrink old cache to m 101 /* first shrink old cache to make more space */
102 off = 1 << (lc_shift - AFFS_I( 102 off = 1 << (lc_shift - AFFS_I(inode)->i_lc_shift);
103 for (i = 1, j = off; j < AFFS_ 103 for (i = 1, j = off; j < AFFS_LC_SIZE; i++, j += off)
104 AFFS_I(inode)->i_ac[i] 104 AFFS_I(inode)->i_ac[i] = AFFS_I(inode)->i_ac[j];
105 105
106 AFFS_I(inode)->i_lc_shift = lc 106 AFFS_I(inode)->i_lc_shift = lc_shift;
107 AFFS_I(inode)->i_lc_mask = lc_ 107 AFFS_I(inode)->i_lc_mask = lc_mask;
108 } 108 }
109 109
110 /* fill cache to the needed index */ 110 /* fill cache to the needed index */
111 i = AFFS_I(inode)->i_lc_size; 111 i = AFFS_I(inode)->i_lc_size;
112 AFFS_I(inode)->i_lc_size = lc_idx + 1; 112 AFFS_I(inode)->i_lc_size = lc_idx + 1;
113 for (; i <= lc_idx; i++) { 113 for (; i <= lc_idx; i++) {
114 if (!i) { 114 if (!i) {
115 AFFS_I(inode)->i_lc[0] 115 AFFS_I(inode)->i_lc[0] = inode->i_ino;
116 continue; 116 continue;
117 } 117 }
118 key = AFFS_I(inode)->i_lc[i - 118 key = AFFS_I(inode)->i_lc[i - 1];
119 j = AFFS_I(inode)->i_lc_mask + 119 j = AFFS_I(inode)->i_lc_mask + 1;
120 // unlock cache 120 // unlock cache
121 for (; j > 0; j--) { 121 for (; j > 0; j--) {
122 bh = affs_bread(sb, ke 122 bh = affs_bread(sb, key);
123 if (!bh) 123 if (!bh)
124 goto err; 124 goto err;
125 key = be32_to_cpu(AFFS 125 key = be32_to_cpu(AFFS_TAIL(sb, bh)->extension);
126 affs_brelse(bh); 126 affs_brelse(bh);
127 } 127 }
128 // lock cache 128 // lock cache
129 AFFS_I(inode)->i_lc[i] = key; 129 AFFS_I(inode)->i_lc[i] = key;
130 } 130 }
131 131
132 return 0; 132 return 0;
133 133
134 err: 134 err:
135 // lock cache 135 // lock cache
136 return -EIO; 136 return -EIO;
137 } 137 }
138 138
139 static struct buffer_head * 139 static struct buffer_head *
140 affs_alloc_extblock(struct inode *inode, struc 140 affs_alloc_extblock(struct inode *inode, struct buffer_head *bh, u32 ext)
141 { 141 {
142 struct super_block *sb = inode->i_sb; 142 struct super_block *sb = inode->i_sb;
143 struct buffer_head *new_bh; 143 struct buffer_head *new_bh;
144 u32 blocknr, tmp; 144 u32 blocknr, tmp;
145 145
146 blocknr = affs_alloc_block(inode, bh-> 146 blocknr = affs_alloc_block(inode, bh->b_blocknr);
147 if (!blocknr) 147 if (!blocknr)
148 return ERR_PTR(-ENOSPC); 148 return ERR_PTR(-ENOSPC);
149 149
150 new_bh = affs_getzeroblk(sb, blocknr); 150 new_bh = affs_getzeroblk(sb, blocknr);
151 if (!new_bh) { 151 if (!new_bh) {
152 affs_free_block(sb, blocknr); 152 affs_free_block(sb, blocknr);
153 return ERR_PTR(-EIO); 153 return ERR_PTR(-EIO);
154 } 154 }
155 155
156 AFFS_HEAD(new_bh)->ptype = cpu_to_be32 156 AFFS_HEAD(new_bh)->ptype = cpu_to_be32(T_LIST);
157 AFFS_HEAD(new_bh)->key = cpu_to_be32(b 157 AFFS_HEAD(new_bh)->key = cpu_to_be32(blocknr);
158 AFFS_TAIL(sb, new_bh)->stype = cpu_to_ 158 AFFS_TAIL(sb, new_bh)->stype = cpu_to_be32(ST_FILE);
159 AFFS_TAIL(sb, new_bh)->parent = cpu_to 159 AFFS_TAIL(sb, new_bh)->parent = cpu_to_be32(inode->i_ino);
160 affs_fix_checksum(sb, new_bh); 160 affs_fix_checksum(sb, new_bh);
161 161
162 mark_buffer_dirty_inode(new_bh, inode) 162 mark_buffer_dirty_inode(new_bh, inode);
163 163
164 tmp = be32_to_cpu(AFFS_TAIL(sb, bh)->e 164 tmp = be32_to_cpu(AFFS_TAIL(sb, bh)->extension);
165 if (tmp) 165 if (tmp)
166 affs_warning(sb, "alloc_ext", 166 affs_warning(sb, "alloc_ext", "previous extension set (%x)", tmp);
167 AFFS_TAIL(sb, bh)->extension = cpu_to_ 167 AFFS_TAIL(sb, bh)->extension = cpu_to_be32(blocknr);
168 affs_adjust_checksum(bh, blocknr - tmp 168 affs_adjust_checksum(bh, blocknr - tmp);
169 mark_buffer_dirty_inode(bh, inode); 169 mark_buffer_dirty_inode(bh, inode);
170 170
171 AFFS_I(inode)->i_extcnt++; 171 AFFS_I(inode)->i_extcnt++;
172 mark_inode_dirty(inode); 172 mark_inode_dirty(inode);
173 173
174 return new_bh; 174 return new_bh;
175 } 175 }
176 176
177 static inline struct buffer_head * 177 static inline struct buffer_head *
178 affs_get_extblock(struct inode *inode, u32 ext 178 affs_get_extblock(struct inode *inode, u32 ext)
179 { 179 {
180 /* inline the simplest case: same exte 180 /* inline the simplest case: same extended block as last time */
181 struct buffer_head *bh = AFFS_I(inode) 181 struct buffer_head *bh = AFFS_I(inode)->i_ext_bh;
182 if (ext == AFFS_I(inode)->i_ext_last) 182 if (ext == AFFS_I(inode)->i_ext_last)
183 atomic_inc(&bh->b_count); 183 atomic_inc(&bh->b_count);
184 else 184 else
185 /* we have to do more (not inl 185 /* we have to do more (not inlined) */
186 bh = affs_get_extblock_slow(in 186 bh = affs_get_extblock_slow(inode, ext);
187 187
188 return bh; 188 return bh;
189 } 189 }
190 190
191 static struct buffer_head * 191 static struct buffer_head *
192 affs_get_extblock_slow(struct inode *inode, u3 192 affs_get_extblock_slow(struct inode *inode, u32 ext)
193 { 193 {
194 struct super_block *sb = inode->i_sb; 194 struct super_block *sb = inode->i_sb;
195 struct buffer_head *bh; 195 struct buffer_head *bh;
196 u32 ext_key; 196 u32 ext_key;
197 u32 lc_idx, lc_off, ac_idx; 197 u32 lc_idx, lc_off, ac_idx;
198 u32 tmp, idx; 198 u32 tmp, idx;
199 199
200 if (ext == AFFS_I(inode)->i_ext_last + 200 if (ext == AFFS_I(inode)->i_ext_last + 1) {
201 /* read the next extended bloc 201 /* read the next extended block from the current one */
202 bh = AFFS_I(inode)->i_ext_bh; 202 bh = AFFS_I(inode)->i_ext_bh;
203 ext_key = be32_to_cpu(AFFS_TAI 203 ext_key = be32_to_cpu(AFFS_TAIL(sb, bh)->extension);
204 if (ext < AFFS_I(inode)->i_ext 204 if (ext < AFFS_I(inode)->i_extcnt)
205 goto read_ext; 205 goto read_ext;
206 if (ext > AFFS_I(inode)->i_ext 206 if (ext > AFFS_I(inode)->i_extcnt)
207 BUG(); 207 BUG();
208 bh = affs_alloc_extblock(inode 208 bh = affs_alloc_extblock(inode, bh, ext);
209 if (IS_ERR(bh)) 209 if (IS_ERR(bh))
210 return bh; 210 return bh;
211 goto store_ext; 211 goto store_ext;
212 } 212 }
213 213
214 if (ext == 0) { 214 if (ext == 0) {
215 /* we seek back to the file he 215 /* we seek back to the file header block */
216 ext_key = inode->i_ino; 216 ext_key = inode->i_ino;
217 goto read_ext; 217 goto read_ext;
218 } 218 }
219 219
220 if (ext >= AFFS_I(inode)->i_extcnt) { 220 if (ext >= AFFS_I(inode)->i_extcnt) {
221 struct buffer_head *prev_bh; 221 struct buffer_head *prev_bh;
222 222
223 /* allocate a new extended blo 223 /* allocate a new extended block */
224 if (ext > AFFS_I(inode)->i_ext 224 if (ext > AFFS_I(inode)->i_extcnt)
225 BUG(); 225 BUG();
226 226
227 /* get previous extended block 227 /* get previous extended block */
228 prev_bh = affs_get_extblock(in 228 prev_bh = affs_get_extblock(inode, ext - 1);
229 if (IS_ERR(prev_bh)) 229 if (IS_ERR(prev_bh))
230 return prev_bh; 230 return prev_bh;
231 bh = affs_alloc_extblock(inode 231 bh = affs_alloc_extblock(inode, prev_bh, ext);
232 affs_brelse(prev_bh); 232 affs_brelse(prev_bh);
233 if (IS_ERR(bh)) 233 if (IS_ERR(bh))
234 return bh; 234 return bh;
235 goto store_ext; 235 goto store_ext;
236 } 236 }
237 237
238 again: 238 again:
239 /* check if there is an extended cache 239 /* check if there is an extended cache and whether it's large enough */
240 lc_idx = ext >> AFFS_I(inode)->i_lc_sh 240 lc_idx = ext >> AFFS_I(inode)->i_lc_shift;
241 lc_off = ext & AFFS_I(inode)->i_lc_mas 241 lc_off = ext & AFFS_I(inode)->i_lc_mask;
242 242
243 if (lc_idx >= AFFS_I(inode)->i_lc_size 243 if (lc_idx >= AFFS_I(inode)->i_lc_size) {
244 int err; 244 int err;
245 245
246 err = affs_grow_extcache(inode 246 err = affs_grow_extcache(inode, lc_idx);
247 if (err) 247 if (err)
248 return ERR_PTR(err); 248 return ERR_PTR(err);
249 goto again; 249 goto again;
250 } 250 }
251 251
252 /* every n'th key we find in the linea 252 /* every n'th key we find in the linear cache */
253 if (!lc_off) { 253 if (!lc_off) {
254 ext_key = AFFS_I(inode)->i_lc[ 254 ext_key = AFFS_I(inode)->i_lc[lc_idx];
255 goto read_ext; 255 goto read_ext;
256 } 256 }
257 257
258 /* maybe it's still in the associative 258 /* maybe it's still in the associative cache */
259 ac_idx = (ext - lc_idx - 1) & AFFS_AC_ 259 ac_idx = (ext - lc_idx - 1) & AFFS_AC_MASK;
260 if (AFFS_I(inode)->i_ac[ac_idx].ext == 260 if (AFFS_I(inode)->i_ac[ac_idx].ext == ext) {
261 ext_key = AFFS_I(inode)->i_ac[ 261 ext_key = AFFS_I(inode)->i_ac[ac_idx].key;
262 goto read_ext; 262 goto read_ext;
263 } 263 }
264 264
265 /* try to find one of the previous ext 265 /* try to find one of the previous extended blocks */
266 tmp = ext; 266 tmp = ext;
267 idx = ac_idx; 267 idx = ac_idx;
268 while (--tmp, --lc_off > 0) { 268 while (--tmp, --lc_off > 0) {
269 idx = (idx - 1) & AFFS_AC_MASK 269 idx = (idx - 1) & AFFS_AC_MASK;
270 if (AFFS_I(inode)->i_ac[idx].e 270 if (AFFS_I(inode)->i_ac[idx].ext == tmp) {
271 ext_key = AFFS_I(inode 271 ext_key = AFFS_I(inode)->i_ac[idx].key;
272 goto find_ext; 272 goto find_ext;
273 } 273 }
274 } 274 }
275 275
276 /* fall back to the linear cache */ 276 /* fall back to the linear cache */
277 ext_key = AFFS_I(inode)->i_lc[lc_idx]; 277 ext_key = AFFS_I(inode)->i_lc[lc_idx];
278 find_ext: 278 find_ext:
279 /* read all extended blocks until we f 279 /* read all extended blocks until we find the one we need */
280 //unlock cache 280 //unlock cache
281 do { 281 do {
282 bh = affs_bread(sb, ext_key); 282 bh = affs_bread(sb, ext_key);
283 if (!bh) 283 if (!bh)
284 goto err_bread; 284 goto err_bread;
285 ext_key = be32_to_cpu(AFFS_TAI 285 ext_key = be32_to_cpu(AFFS_TAIL(sb, bh)->extension);
286 affs_brelse(bh); 286 affs_brelse(bh);
287 tmp++; 287 tmp++;
288 } while (tmp < ext); 288 } while (tmp < ext);
289 //lock cache 289 //lock cache
290 290
291 /* store it in the associative cache * 291 /* store it in the associative cache */
292 // recalculate ac_idx? 292 // recalculate ac_idx?
293 AFFS_I(inode)->i_ac[ac_idx].ext = ext; 293 AFFS_I(inode)->i_ac[ac_idx].ext = ext;
294 AFFS_I(inode)->i_ac[ac_idx].key = ext_ 294 AFFS_I(inode)->i_ac[ac_idx].key = ext_key;
295 295
296 read_ext: 296 read_ext:
297 /* finally read the right extended blo 297 /* finally read the right extended block */
298 //unlock cache 298 //unlock cache
299 bh = affs_bread(sb, ext_key); 299 bh = affs_bread(sb, ext_key);
300 if (!bh) 300 if (!bh)
301 goto err_bread; 301 goto err_bread;
302 //lock cache 302 //lock cache
303 303
304 store_ext: 304 store_ext:
305 /* release old cached extended block a 305 /* release old cached extended block and store the new one */
306 affs_brelse(AFFS_I(inode)->i_ext_bh); 306 affs_brelse(AFFS_I(inode)->i_ext_bh);
307 AFFS_I(inode)->i_ext_last = ext; 307 AFFS_I(inode)->i_ext_last = ext;
308 AFFS_I(inode)->i_ext_bh = bh; 308 AFFS_I(inode)->i_ext_bh = bh;
309 atomic_inc(&bh->b_count); 309 atomic_inc(&bh->b_count);
310 310
311 return bh; 311 return bh;
312 312
313 err_bread: 313 err_bread:
314 affs_brelse(bh); 314 affs_brelse(bh);
315 return ERR_PTR(-EIO); 315 return ERR_PTR(-EIO);
316 } 316 }
317 317
318 static int 318 static int
319 affs_get_block(struct inode *inode, sector_t b 319 affs_get_block(struct inode *inode, sector_t block, struct buffer_head *bh_result, int create)
320 { 320 {
321 struct super_block *sb = inode->i 321 struct super_block *sb = inode->i_sb;
322 struct buffer_head *ext_bh; 322 struct buffer_head *ext_bh;
323 u32 ext; 323 u32 ext;
324 324
325 pr_debug("AFFS: get_block(%u, %lu)\n", 325 pr_debug("AFFS: get_block(%u, %lu)\n", (u32)inode->i_ino, (unsigned long)block);
326 326
327 327
328 if (block > (sector_t)0x7fffffffUL) 328 if (block > (sector_t)0x7fffffffUL)
329 BUG(); 329 BUG();
330 330
331 if (block >= AFFS_I(inode)->i_blkcnt) 331 if (block >= AFFS_I(inode)->i_blkcnt) {
332 if (block > AFFS_I(inode)->i_b 332 if (block > AFFS_I(inode)->i_blkcnt || !create)
333 goto err_big; 333 goto err_big;
334 } else 334 } else
335 create = 0; 335 create = 0;
336 336
337 //lock cache 337 //lock cache
338 affs_lock_ext(inode); 338 affs_lock_ext(inode);
339 339
340 ext = (u32)block / AFFS_SB(sb)->s_hash 340 ext = (u32)block / AFFS_SB(sb)->s_hashsize;
341 block -= ext * AFFS_SB(sb)->s_hashsize 341 block -= ext * AFFS_SB(sb)->s_hashsize;
342 ext_bh = affs_get_extblock(inode, ext) 342 ext_bh = affs_get_extblock(inode, ext);
343 if (IS_ERR(ext_bh)) 343 if (IS_ERR(ext_bh))
344 goto err_ext; 344 goto err_ext;
345 map_bh(bh_result, sb, (sector_t)be32_t 345 map_bh(bh_result, sb, (sector_t)be32_to_cpu(AFFS_BLOCK(sb, ext_bh, block)));
346 346
347 if (create) { 347 if (create) {
348 u32 blocknr = affs_alloc_block 348 u32 blocknr = affs_alloc_block(inode, ext_bh->b_blocknr);
349 if (!blocknr) 349 if (!blocknr)
350 goto err_alloc; 350 goto err_alloc;
351 set_buffer_new(bh_result); 351 set_buffer_new(bh_result);
352 AFFS_I(inode)->mmu_private += 352 AFFS_I(inode)->mmu_private += AFFS_SB(sb)->s_data_blksize;
353 AFFS_I(inode)->i_blkcnt++; 353 AFFS_I(inode)->i_blkcnt++;
354 354
355 /* store new block */ 355 /* store new block */
356 if (bh_result->b_blocknr) 356 if (bh_result->b_blocknr)
357 affs_warning(sb, "get_ 357 affs_warning(sb, "get_block", "block already set (%x)", bh_result->b_blocknr);
358 AFFS_BLOCK(sb, ext_bh, block) 358 AFFS_BLOCK(sb, ext_bh, block) = cpu_to_be32(blocknr);
359 AFFS_HEAD(ext_bh)->block_count 359 AFFS_HEAD(ext_bh)->block_count = cpu_to_be32(block + 1);
360 affs_adjust_checksum(ext_bh, b 360 affs_adjust_checksum(ext_bh, blocknr - bh_result->b_blocknr + 1);
361 bh_result->b_blocknr = blocknr 361 bh_result->b_blocknr = blocknr;
362 362
363 if (!block) { 363 if (!block) {
364 /* insert first block 364 /* insert first block into header block */
365 u32 tmp = be32_to_cpu( 365 u32 tmp = be32_to_cpu(AFFS_HEAD(ext_bh)->first_data);
366 if (tmp) 366 if (tmp)
367 affs_warning(s 367 affs_warning(sb, "get_block", "first block already set (%d)", tmp);
368 AFFS_HEAD(ext_bh)->fir 368 AFFS_HEAD(ext_bh)->first_data = cpu_to_be32(blocknr);
369 affs_adjust_checksum(e 369 affs_adjust_checksum(ext_bh, blocknr - tmp);
370 } 370 }
371 } 371 }
372 372
373 affs_brelse(ext_bh); 373 affs_brelse(ext_bh);
374 //unlock cache 374 //unlock cache
375 affs_unlock_ext(inode); 375 affs_unlock_ext(inode);
376 return 0; 376 return 0;
377 377
378 err_big: 378 err_big:
379 affs_error(inode->i_sb,"get_block","st 379 affs_error(inode->i_sb,"get_block","strange block request %d", block);
380 return -EIO; 380 return -EIO;
381 err_ext: 381 err_ext:
382 // unlock cache 382 // unlock cache
383 affs_unlock_ext(inode); 383 affs_unlock_ext(inode);
384 return PTR_ERR(ext_bh); 384 return PTR_ERR(ext_bh);
385 err_alloc: 385 err_alloc:
386 brelse(ext_bh); 386 brelse(ext_bh);
387 clear_buffer_mapped(bh_result); 387 clear_buffer_mapped(bh_result);
388 bh_result->b_bdev = NULL; 388 bh_result->b_bdev = NULL;
389 // unlock cache 389 // unlock cache
390 affs_unlock_ext(inode); 390 affs_unlock_ext(inode);
391 return -ENOSPC; 391 return -ENOSPC;
392 } 392 }
393 393
394 static int affs_writepage(struct page *page, s 394 static int affs_writepage(struct page *page, struct writeback_control *wbc)
395 { 395 {
396 return block_write_full_page(page, aff 396 return block_write_full_page(page, affs_get_block, wbc);
397 } 397 }
398 398
399 static int affs_readpage(struct file *file, st 399 static int affs_readpage(struct file *file, struct page *page)
400 { 400 {
401 return block_read_full_page(page, affs 401 return block_read_full_page(page, affs_get_block);
402 } 402 }
403 403
404 static int affs_write_begin(struct file *file, 404 static int affs_write_begin(struct file *file, struct address_space *mapping,
405 loff_t pos, unsigned l 405 loff_t pos, unsigned len, unsigned flags,
406 struct page **pagep, v 406 struct page **pagep, void **fsdata)
407 { 407 {
408 *pagep = NULL; 408 *pagep = NULL;
409 return cont_write_begin(file, mapping, 409 return cont_write_begin(file, mapping, pos, len, flags, pagep, fsdata,
410 affs_get_block 410 affs_get_block,
411 &AFFS_I(mappin 411 &AFFS_I(mapping->host)->mmu_private);
412 } 412 }
413 413
414 static sector_t _affs_bmap(struct address_spac 414 static sector_t _affs_bmap(struct address_space *mapping, sector_t block)
415 { 415 {
416 return generic_block_bmap(mapping,bloc 416 return generic_block_bmap(mapping,block,affs_get_block);
417 } 417 }
418 418
419 const struct address_space_operations affs_aop 419 const struct address_space_operations affs_aops = {
420 .readpage = affs_readpage, 420 .readpage = affs_readpage,
421 .writepage = affs_writepage, 421 .writepage = affs_writepage,
422 .sync_page = block_sync_page, 422 .sync_page = block_sync_page,
423 .write_begin = affs_write_begin, 423 .write_begin = affs_write_begin,
424 .write_end = generic_write_end, 424 .write_end = generic_write_end,
425 .bmap = _affs_bmap 425 .bmap = _affs_bmap
426 }; 426 };
427 427
428 static inline struct buffer_head * 428 static inline struct buffer_head *
429 affs_bread_ino(struct inode *inode, int block, 429 affs_bread_ino(struct inode *inode, int block, int create)
430 { 430 {
431 struct buffer_head *bh, tmp_bh; 431 struct buffer_head *bh, tmp_bh;
432 int err; 432 int err;
433 433
434 tmp_bh.b_state = 0; 434 tmp_bh.b_state = 0;
435 err = affs_get_block(inode, block, &tm 435 err = affs_get_block(inode, block, &tmp_bh, create);
436 if (!err) { 436 if (!err) {
437 bh = affs_bread(inode->i_sb, t 437 bh = affs_bread(inode->i_sb, tmp_bh.b_blocknr);
438 if (bh) { 438 if (bh) {
439 bh->b_state |= tmp_bh. 439 bh->b_state |= tmp_bh.b_state;
440 return bh; 440 return bh;
441 } 441 }
442 err = -EIO; 442 err = -EIO;
443 } 443 }
444 return ERR_PTR(err); 444 return ERR_PTR(err);
445 } 445 }
446 446
447 static inline struct buffer_head * 447 static inline struct buffer_head *
448 affs_getzeroblk_ino(struct inode *inode, int b 448 affs_getzeroblk_ino(struct inode *inode, int block)
449 { 449 {
450 struct buffer_head *bh, tmp_bh; 450 struct buffer_head *bh, tmp_bh;
451 int err; 451 int err;
452 452
453 tmp_bh.b_state = 0; 453 tmp_bh.b_state = 0;
454 err = affs_get_block(inode, block, &tm 454 err = affs_get_block(inode, block, &tmp_bh, 1);
455 if (!err) { 455 if (!err) {
456 bh = affs_getzeroblk(inode->i_ 456 bh = affs_getzeroblk(inode->i_sb, tmp_bh.b_blocknr);
457 if (bh) { 457 if (bh) {
458 bh->b_state |= tmp_bh. 458 bh->b_state |= tmp_bh.b_state;
459 return bh; 459 return bh;
460 } 460 }
461 err = -EIO; 461 err = -EIO;
462 } 462 }
463 return ERR_PTR(err); 463 return ERR_PTR(err);
464 } 464 }
465 465
466 static inline struct buffer_head * 466 static inline struct buffer_head *
467 affs_getemptyblk_ino(struct inode *inode, int 467 affs_getemptyblk_ino(struct inode *inode, int block)
468 { 468 {
469 struct buffer_head *bh, tmp_bh; 469 struct buffer_head *bh, tmp_bh;
470 int err; 470 int err;
471 471
472 tmp_bh.b_state = 0; 472 tmp_bh.b_state = 0;
473 err = affs_get_block(inode, block, &tm 473 err = affs_get_block(inode, block, &tmp_bh, 1);
474 if (!err) { 474 if (!err) {
475 bh = affs_getemptyblk(inode->i 475 bh = affs_getemptyblk(inode->i_sb, tmp_bh.b_blocknr);
476 if (bh) { 476 if (bh) {
477 bh->b_state |= tmp_bh. 477 bh->b_state |= tmp_bh.b_state;
478 return bh; 478 return bh;
479 } 479 }
480 err = -EIO; 480 err = -EIO;
481 } 481 }
482 return ERR_PTR(err); 482 return ERR_PTR(err);
483 } 483 }
484 484
485 static int 485 static int
486 affs_do_readpage_ofs(struct file *file, struct 486 affs_do_readpage_ofs(struct file *file, struct page *page, unsigned from, unsigned to)
487 { 487 {
488 struct inode *inode = page->mapping->h 488 struct inode *inode = page->mapping->host;
489 struct super_block *sb = inode->i_sb; 489 struct super_block *sb = inode->i_sb;
490 struct buffer_head *bh; 490 struct buffer_head *bh;
491 char *data; 491 char *data;
492 u32 bidx, boff, bsize; 492 u32 bidx, boff, bsize;
493 u32 tmp; 493 u32 tmp;
494 494
495 pr_debug("AFFS: read_page(%u, %ld, %d, 495 pr_debug("AFFS: read_page(%u, %ld, %d, %d)\n", (u32)inode->i_ino, page->index, from, to);
496 if (from > to || to > PAGE_CACHE_SIZE) 496 if (from > to || to > PAGE_CACHE_SIZE)
497 BUG(); 497 BUG();
498 kmap(page); 498 kmap(page);
499 data = page_address(page); 499 data = page_address(page);
500 bsize = AFFS_SB(sb)->s_data_blksize; 500 bsize = AFFS_SB(sb)->s_data_blksize;
501 tmp = (page->index << PAGE_CACHE_SHIFT 501 tmp = (page->index << PAGE_CACHE_SHIFT) + from;
502 bidx = tmp / bsize; 502 bidx = tmp / bsize;
503 boff = tmp % bsize; 503 boff = tmp % bsize;
504 504
505 while (from < to) { 505 while (from < to) {
506 bh = affs_bread_ino(inode, bid 506 bh = affs_bread_ino(inode, bidx, 0);
507 if (IS_ERR(bh)) 507 if (IS_ERR(bh))
508 return PTR_ERR(bh); 508 return PTR_ERR(bh);
509 tmp = min(bsize - boff, to - f 509 tmp = min(bsize - boff, to - from);
510 if (from + tmp > to || tmp > b 510 if (from + tmp > to || tmp > bsize)
511 BUG(); 511 BUG();
512 memcpy(data + from, AFFS_DATA( 512 memcpy(data + from, AFFS_DATA(bh) + boff, tmp);
513 affs_brelse(bh); 513 affs_brelse(bh);
514 bidx++; 514 bidx++;
515 from += tmp; 515 from += tmp;
516 boff = 0; 516 boff = 0;
517 } 517 }
518 flush_dcache_page(page); 518 flush_dcache_page(page);
519 kunmap(page); 519 kunmap(page);
520 return 0; 520 return 0;
521 } 521 }
522 522
523 static int 523 static int
524 affs_extent_file_ofs(struct inode *inode, u32 524 affs_extent_file_ofs(struct inode *inode, u32 newsize)
525 { 525 {
526 struct super_block *sb = inode->i_sb; 526 struct super_block *sb = inode->i_sb;
527 struct buffer_head *bh, *prev_bh; 527 struct buffer_head *bh, *prev_bh;
528 u32 bidx, boff; 528 u32 bidx, boff;
529 u32 size, bsize; 529 u32 size, bsize;
530 u32 tmp; 530 u32 tmp;
531 531
532 pr_debug("AFFS: extent_file(%u, %d)\n" 532 pr_debug("AFFS: extent_file(%u, %d)\n", (u32)inode->i_ino, newsize);
533 bsize = AFFS_SB(sb)->s_data_blksize; 533 bsize = AFFS_SB(sb)->s_data_blksize;
534 bh = NULL; 534 bh = NULL;
535 size = AFFS_I(inode)->mmu_private; 535 size = AFFS_I(inode)->mmu_private;
536 bidx = size / bsize; 536 bidx = size / bsize;
537 boff = size % bsize; 537 boff = size % bsize;
538 if (boff) { 538 if (boff) {
539 bh = affs_bread_ino(inode, bid 539 bh = affs_bread_ino(inode, bidx, 0);
540 if (IS_ERR(bh)) 540 if (IS_ERR(bh))
541 return PTR_ERR(bh); 541 return PTR_ERR(bh);
542 tmp = min(bsize - boff, newsiz 542 tmp = min(bsize - boff, newsize - size);
543 if (boff + tmp > bsize || tmp 543 if (boff + tmp > bsize || tmp > bsize)
544 BUG(); 544 BUG();
545 memset(AFFS_DATA(bh) + boff, 0 545 memset(AFFS_DATA(bh) + boff, 0, tmp);
546 AFFS_DATA_HEAD(bh)->size = cpu 546 AFFS_DATA_HEAD(bh)->size = cpu_to_be32(be32_to_cpu(AFFS_DATA_HEAD(bh)->size) + tmp);
547 affs_fix_checksum(sb, bh); 547 affs_fix_checksum(sb, bh);
548 mark_buffer_dirty_inode(bh, in 548 mark_buffer_dirty_inode(bh, inode);
549 size += tmp; 549 size += tmp;
550 bidx++; 550 bidx++;
551 } else if (bidx) { 551 } else if (bidx) {
552 bh = affs_bread_ino(inode, bid 552 bh = affs_bread_ino(inode, bidx - 1, 0);
553 if (IS_ERR(bh)) 553 if (IS_ERR(bh))
554 return PTR_ERR(bh); 554 return PTR_ERR(bh);
555 } 555 }
556 556
557 while (size < newsize) { 557 while (size < newsize) {
558 prev_bh = bh; 558 prev_bh = bh;
559 bh = affs_getzeroblk_ino(inode 559 bh = affs_getzeroblk_ino(inode, bidx);
560 if (IS_ERR(bh)) 560 if (IS_ERR(bh))
561 goto out; 561 goto out;
562 tmp = min(bsize, newsize - siz 562 tmp = min(bsize, newsize - size);
563 if (tmp > bsize) 563 if (tmp > bsize)
564 BUG(); 564 BUG();
565 AFFS_DATA_HEAD(bh)->ptype = cp 565 AFFS_DATA_HEAD(bh)->ptype = cpu_to_be32(T_DATA);
566 AFFS_DATA_HEAD(bh)->key = cpu_ 566 AFFS_DATA_HEAD(bh)->key = cpu_to_be32(inode->i_ino);
567 AFFS_DATA_HEAD(bh)->sequence = 567 AFFS_DATA_HEAD(bh)->sequence = cpu_to_be32(bidx);
568 AFFS_DATA_HEAD(bh)->size = cpu 568 AFFS_DATA_HEAD(bh)->size = cpu_to_be32(tmp);
569 affs_fix_checksum(sb, bh); 569 affs_fix_checksum(sb, bh);
570 bh->b_state &= ~(1UL << BH_New 570 bh->b_state &= ~(1UL << BH_New);
571 mark_buffer_dirty_inode(bh, in 571 mark_buffer_dirty_inode(bh, inode);
572 if (prev_bh) { 572 if (prev_bh) {
573 u32 tmp = be32_to_cpu( 573 u32 tmp = be32_to_cpu(AFFS_DATA_HEAD(prev_bh)->next);
574 if (tmp) 574 if (tmp)
575 affs_warning(s 575 affs_warning(sb, "extent_file_ofs", "next block already set for %d (%d)", bidx, tmp);
576 AFFS_DATA_HEAD(prev_bh 576 AFFS_DATA_HEAD(prev_bh)->next = cpu_to_be32(bh->b_blocknr);
577 affs_adjust_checksum(p 577 affs_adjust_checksum(prev_bh, bh->b_blocknr - tmp);
578 mark_buffer_dirty_inod 578 mark_buffer_dirty_inode(prev_bh, inode);
579 affs_brelse(prev_bh); 579 affs_brelse(prev_bh);
580 } 580 }
581 size += bsize; 581 size += bsize;
582 bidx++; 582 bidx++;
583 } 583 }
584 affs_brelse(bh); 584 affs_brelse(bh);
585 inode->i_size = AFFS_I(inode)->mmu_pri 585 inode->i_size = AFFS_I(inode)->mmu_private = newsize;
586 return 0; 586 return 0;
587 587
588 out: 588 out:
589 inode->i_size = AFFS_I(inode)->mmu_pri 589 inode->i_size = AFFS_I(inode)->mmu_private = newsize;
590 return PTR_ERR(bh); 590 return PTR_ERR(bh);
591 } 591 }
592 592
593 static int 593 static int
594 affs_readpage_ofs(struct file *file, struct pa 594 affs_readpage_ofs(struct file *file, struct page *page)
595 { 595 {
596 struct inode *inode = page->mapping->h 596 struct inode *inode = page->mapping->host;
597 u32 to; 597 u32 to;
598 int err; 598 int err;
599 599
600 pr_debug("AFFS: read_page(%u, %ld)\n", 600 pr_debug("AFFS: read_page(%u, %ld)\n", (u32)inode->i_ino, page->index);
601 to = PAGE_CACHE_SIZE; 601 to = PAGE_CACHE_SIZE;
602 if (((page->index + 1) << PAGE_CACHE_S 602 if (((page->index + 1) << PAGE_CACHE_SHIFT) > inode->i_size) {
603 to = inode->i_size & ~PAGE_CAC 603 to = inode->i_size & ~PAGE_CACHE_MASK;
604 memset(page_address(page) + to 604 memset(page_address(page) + to, 0, PAGE_CACHE_SIZE - to);
605 } 605 }
606 606
607 err = affs_do_readpage_ofs(file, page, 607 err = affs_do_readpage_ofs(file, page, 0, to);
608 if (!err) 608 if (!err)
609 SetPageUptodate(page); 609 SetPageUptodate(page);
610 unlock_page(page); 610 unlock_page(page);
611 return err; 611 return err;
612 } 612 }
613 613
614 static int affs_write_begin_ofs(struct file *f 614 static int affs_write_begin_ofs(struct file *file, struct address_space *mapping,
615 loff_t pos, un 615 loff_t pos, unsigned len, unsigned flags,
616 struct page ** 616 struct page **pagep, void **fsdata)
617 { 617 {
618 struct inode *inode = mapping->host; 618 struct inode *inode = mapping->host;
619 struct page *page; 619 struct page *page;
620 pgoff_t index; 620 pgoff_t index;
621 int err = 0; 621 int err = 0;
622 622
623 pr_debug("AFFS: write_begin(%u, %llu, 623 pr_debug("AFFS: write_begin(%u, %llu, %llu)\n", (u32)inode->i_ino, (unsigned long long)pos, (unsigned long long)pos + len);
624 if (pos > AFFS_I(inode)->mmu_private) 624 if (pos > AFFS_I(inode)->mmu_private) {
625 /* XXX: this probably leaves a 625 /* XXX: this probably leaves a too-big i_size in case of
626 * failure. Should really be u 626 * failure. Should really be updating i_size at write_end time
627 */ 627 */
628 err = affs_extent_file_ofs(ino 628 err = affs_extent_file_ofs(inode, pos);
629 if (err) 629 if (err)
630 return err; 630 return err;
631 } 631 }
632 632
633 index = pos >> PAGE_CACHE_SHIFT; 633 index = pos >> PAGE_CACHE_SHIFT;
634 page = __grab_cache_page(mapping, inde 634 page = __grab_cache_page(mapping, index);
635 if (!page) 635 if (!page)
636 return -ENOMEM; 636 return -ENOMEM;
637 *pagep = page; 637 *pagep = page;
638 638
639 if (PageUptodate(page)) 639 if (PageUptodate(page))
640 return 0; 640 return 0;
641 641
642 /* XXX: inefficient but safe in the fa 642 /* XXX: inefficient but safe in the face of short writes */
643 err = affs_do_readpage_ofs(file, page, 643 err = affs_do_readpage_ofs(file, page, 0, PAGE_CACHE_SIZE);
644 if (err) { 644 if (err) {
645 unlock_page(page); 645 unlock_page(page);
646 page_cache_release(page); 646 page_cache_release(page);
647 } 647 }
648 return err; 648 return err;
649 } 649 }
650 650
651 static int affs_write_end_ofs(struct file *fil 651 static int affs_write_end_ofs(struct file *file, struct address_space *mapping,
652 loff_t pos, un 652 loff_t pos, unsigned len, unsigned copied,
653 struct page *p 653 struct page *page, void *fsdata)
654 { 654 {
655 struct inode *inode = mapping->host; 655 struct inode *inode = mapping->host;
656 struct super_block *sb = inode->i_sb; 656 struct super_block *sb = inode->i_sb;
657 struct buffer_head *bh, *prev_bh; 657 struct buffer_head *bh, *prev_bh;
658 char *data; 658 char *data;
659 u32 bidx, boff, bsize; 659 u32 bidx, boff, bsize;
660 unsigned from, to; 660 unsigned from, to;
661 u32 tmp; 661 u32 tmp;
662 int written; 662 int written;
663 663
664 from = pos & (PAGE_CACHE_SIZE - 1); 664 from = pos & (PAGE_CACHE_SIZE - 1);
665 to = pos + len; 665 to = pos + len;
666 /* 666 /*
667 * XXX: not sure if this can handle sh 667 * XXX: not sure if this can handle short copies (len < copied), but
668 * we don't have to, because the page 668 * we don't have to, because the page should always be uptodate here,
669 * due to write_begin. 669 * due to write_begin.
670 */ 670 */
671 671
672 pr_debug("AFFS: write_begin(%u, %llu, 672 pr_debug("AFFS: write_begin(%u, %llu, %llu)\n", (u32)inode->i_ino, (unsigned long long)pos, (unsigned long long)pos + len);
673 bsize = AFFS_SB(sb)->s_data_blksize; 673 bsize = AFFS_SB(sb)->s_data_blksize;
674 data = page_address(page); 674 data = page_address(page);
675 675
676 bh = NULL; 676 bh = NULL;
677 written = 0; 677 written = 0;
678 tmp = (page->index << PAGE_CACHE_SHIFT 678 tmp = (page->index << PAGE_CACHE_SHIFT) + from;
679 bidx = tmp / bsize; 679 bidx = tmp / bsize;
680 boff = tmp % bsize; 680 boff = tmp % bsize;
681 if (boff) { 681 if (boff) {
682 bh = affs_bread_ino(inode, bid 682 bh = affs_bread_ino(inode, bidx, 0);
683 if (IS_ERR(bh)) 683 if (IS_ERR(bh))
684 return PTR_ERR(bh); 684 return PTR_ERR(bh);
685 tmp = min(bsize - boff, to - f 685 tmp = min(bsize - boff, to - from);
686 if (boff + tmp > bsize || tmp 686 if (boff + tmp > bsize || tmp > bsize)
687 BUG(); 687 BUG();
688 memcpy(AFFS_DATA(bh) + boff, d 688 memcpy(AFFS_DATA(bh) + boff, data + from, tmp);
689 AFFS_DATA_HEAD(bh)->size = cpu 689 AFFS_DATA_HEAD(bh)->size = cpu_to_be32(be32_to_cpu(AFFS_DATA_HEAD(bh)->size) + tmp);
690 affs_fix_checksum(sb, bh); 690 affs_fix_checksum(sb, bh);
691 mark_buffer_dirty_inode(bh, in 691 mark_buffer_dirty_inode(bh, inode);
692 written += tmp; 692 written += tmp;
693 from += tmp; 693 from += tmp;
694 bidx++; 694 bidx++;
695 } else if (bidx) { 695 } else if (bidx) {
696 bh = affs_bread_ino(inode, bid 696 bh = affs_bread_ino(inode, bidx - 1, 0);
697 if (IS_ERR(bh)) 697 if (IS_ERR(bh))
698 return PTR_ERR(bh); 698 return PTR_ERR(bh);
699 } 699 }
700 while (from + bsize <= to) { 700 while (from + bsize <= to) {
701 prev_bh = bh; 701 prev_bh = bh;
702 bh = affs_getemptyblk_ino(inod 702 bh = affs_getemptyblk_ino(inode, bidx);
703 if (IS_ERR(bh)) 703 if (IS_ERR(bh))
704 goto out; 704 goto out;
705 memcpy(AFFS_DATA(bh), data + f 705 memcpy(AFFS_DATA(bh), data + from, bsize);
706 if (buffer_new(bh)) { 706 if (buffer_new(bh)) {
707 AFFS_DATA_HEAD(bh)->pt 707 AFFS_DATA_HEAD(bh)->ptype = cpu_to_be32(T_DATA);
708 AFFS_DATA_HEAD(bh)->ke 708 AFFS_DATA_HEAD(bh)->key = cpu_to_be32(inode->i_ino);
709 AFFS_DATA_HEAD(bh)->se 709 AFFS_DATA_HEAD(bh)->sequence = cpu_to_be32(bidx);
710 AFFS_DATA_HEAD(bh)->si 710 AFFS_DATA_HEAD(bh)->size = cpu_to_be32(bsize);
711 AFFS_DATA_HEAD(bh)->ne 711 AFFS_DATA_HEAD(bh)->next = 0;
712 bh->b_state &= ~(1UL < 712 bh->b_state &= ~(1UL << BH_New);
713 if (prev_bh) { 713 if (prev_bh) {
714 u32 tmp = be32 714 u32 tmp = be32_to_cpu(AFFS_DATA_HEAD(prev_bh)->next);
715 if (tmp) 715 if (tmp)
716 affs_w 716 affs_warning(sb, "commit_write_ofs", "next block already set for %d (%d)", bidx, tmp);
717 AFFS_DATA_HEAD 717 AFFS_DATA_HEAD(prev_bh)->next = cpu_to_be32(bh->b_blocknr);
718 affs_adjust_ch 718 affs_adjust_checksum(prev_bh, bh->b_blocknr - tmp);
719 mark_buffer_di 719 mark_buffer_dirty_inode(prev_bh, inode);
720 } 720 }
721 } 721 }
722 affs_brelse(prev_bh); 722 affs_brelse(prev_bh);
723 affs_fix_checksum(sb, bh); 723 affs_fix_checksum(sb, bh);
724 mark_buffer_dirty_inode(bh, in 724 mark_buffer_dirty_inode(bh, inode);
725 written += bsize; 725 written += bsize;
726 from += bsize; 726 from += bsize;
727 bidx++; 727 bidx++;
728 } 728 }
729 if (from < to) { 729 if (from < to) {
730 prev_bh = bh; 730 prev_bh = bh;
731 bh = affs_bread_ino(inode, bid 731 bh = affs_bread_ino(inode, bidx, 1);
732 if (IS_ERR(bh)) 732 if (IS_ERR(bh))
733 goto out; 733 goto out;
734 tmp = min(bsize, to - from); 734 tmp = min(bsize, to - from);
735 if (tmp > bsize) 735 if (tmp > bsize)
736 BUG(); 736 BUG();
737 memcpy(AFFS_DATA(bh), data + f 737 memcpy(AFFS_DATA(bh), data + from, tmp);
738 if (buffer_new(bh)) { 738 if (buffer_new(bh)) {
739 AFFS_DATA_HEAD(bh)->pt 739 AFFS_DATA_HEAD(bh)->ptype = cpu_to_be32(T_DATA);
740 AFFS_DATA_HEAD(bh)->ke 740 AFFS_DATA_HEAD(bh)->key = cpu_to_be32(inode->i_ino);
741 AFFS_DATA_HEAD(bh)->se 741 AFFS_DATA_HEAD(bh)->sequence = cpu_to_be32(bidx);
742 AFFS_DATA_HEAD(bh)->si 742 AFFS_DATA_HEAD(bh)->size = cpu_to_be32(tmp);
743 AFFS_DATA_HEAD(bh)->ne 743 AFFS_DATA_HEAD(bh)->next = 0;
744 bh->b_state &= ~(1UL < 744 bh->b_state &= ~(1UL << BH_New);
745 if (prev_bh) { 745 if (prev_bh) {
746 u32 tmp = be32 746 u32 tmp = be32_to_cpu(AFFS_DATA_HEAD(prev_bh)->next);
747 if (tmp) 747 if (tmp)
748 affs_w 748 affs_warning(sb, "commit_write_ofs", "next block already set for %d (%d)", bidx, tmp);
749 AFFS_DATA_HEAD 749 AFFS_DATA_HEAD(prev_bh)->next = cpu_to_be32(bh->b_blocknr);
750 affs_adjust_ch 750 affs_adjust_checksum(prev_bh, bh->b_blocknr - tmp);
751 mark_buffer_di 751 mark_buffer_dirty_inode(prev_bh, inode);
752 } 752 }
753 } else if (be32_to_cpu(AFFS_DA 753 } else if (be32_to_cpu(AFFS_DATA_HEAD(bh)->size) < tmp)
754 AFFS_DATA_HEAD(bh)->si 754 AFFS_DATA_HEAD(bh)->size = cpu_to_be32(tmp);
755 affs_brelse(prev_bh); 755 affs_brelse(prev_bh);
756 affs_fix_checksum(sb, bh); 756 affs_fix_checksum(sb, bh);
757 mark_buffer_dirty_inode(bh, in 757 mark_buffer_dirty_inode(bh, inode);
758 written += tmp; 758 written += tmp;
759 from += tmp; 759 from += tmp;
760 bidx++; 760 bidx++;
761 } 761 }
762 SetPageUptodate(page); 762 SetPageUptodate(page);
763 763
764 done: 764 done:
765 affs_brelse(bh); 765 affs_brelse(bh);
766 tmp = (page->index << PAGE_CACHE_SHIFT 766 tmp = (page->index << PAGE_CACHE_SHIFT) + from;
767 if (tmp > inode->i_size) 767 if (tmp > inode->i_size)
768 inode->i_size = AFFS_I(inode)- 768 inode->i_size = AFFS_I(inode)->mmu_private = tmp;
769 769
770 unlock_page(page); 770 unlock_page(page);
771 page_cache_release(page); 771 page_cache_release(page);
772 772
773 return written; 773 return written;
774 774
775 out: 775 out:
776 bh = prev_bh; 776 bh = prev_bh;
777 if (!written) 777 if (!written)
778 written = PTR_ERR(bh); 778 written = PTR_ERR(bh);
779 goto done; 779 goto done;
780 } 780 }
781 781
782 const struct address_space_operations affs_aop 782 const struct address_space_operations affs_aops_ofs = {
783 .readpage = affs_readpage_ofs, 783 .readpage = affs_readpage_ofs,
784 //.writepage = affs_writepage_ofs, 784 //.writepage = affs_writepage_ofs,
785 //.sync_page = affs_sync_page_ofs, 785 //.sync_page = affs_sync_page_ofs,
786 .write_begin = affs_write_begin_ofs, 786 .write_begin = affs_write_begin_ofs,
787 .write_end = affs_write_end_ofs 787 .write_end = affs_write_end_ofs
788 }; 788 };
789 789
790 /* Free any preallocated blocks. */ 790 /* Free any preallocated blocks. */
791 791
792 void 792 void
793 affs_free_prealloc(struct inode *inode) 793 affs_free_prealloc(struct inode *inode)
794 { 794 {
795 struct super_block *sb = inode->i_sb; 795 struct super_block *sb = inode->i_sb;
796 796
797 pr_debug("AFFS: free_prealloc(ino=%lu) 797 pr_debug("AFFS: free_prealloc(ino=%lu)\n", inode->i_ino);
798 798
799 while (AFFS_I(inode)->i_pa_cnt) { 799 while (AFFS_I(inode)->i_pa_cnt) {
800 AFFS_I(inode)->i_pa_cnt--; 800 AFFS_I(inode)->i_pa_cnt--;
801 affs_free_block(sb, ++AFFS_I(i 801 affs_free_block(sb, ++AFFS_I(inode)->i_lastalloc);
802 } 802 }
803 } 803 }
804 804
805 /* Truncate (or enlarge) a file to the request 805 /* Truncate (or enlarge) a file to the requested size. */
806 806
807 void 807 void
808 affs_truncate(struct inode *inode) 808 affs_truncate(struct inode *inode)
809 { 809 {
810 struct super_block *sb = inode->i_sb; 810 struct super_block *sb = inode->i_sb;
811 u32 ext, ext_key; 811 u32 ext, ext_key;
812 u32 last_blk, blkcnt, blk; 812 u32 last_blk, blkcnt, blk;
813 u32 size; 813 u32 size;
814 struct buffer_head *ext_bh; 814 struct buffer_head *ext_bh;
815 int i; 815 int i;
816 816
817 pr_debug("AFFS: truncate(inode=%d, old 817 pr_debug("AFFS: truncate(inode=%d, oldsize=%u, newsize=%u)\n",
818 (u32)inode->i_ino, (u32)AFFS_ 818 (u32)inode->i_ino, (u32)AFFS_I(inode)->mmu_private, (u32)inode->i_size);
819 819
820 last_blk = 0; 820 last_blk = 0;
821 ext = 0; 821 ext = 0;
822 if (inode->i_size) { 822 if (inode->i_size) {
823 last_blk = ((u32)inode->i_size 823 last_blk = ((u32)inode->i_size - 1) / AFFS_SB(sb)->s_data_blksize;
824 ext = last_blk / AFFS_SB(sb)-> 824 ext = last_blk / AFFS_SB(sb)->s_hashsize;
825 } 825 }
826 826
827 if (inode->i_size > AFFS_I(inode)->mmu 827 if (inode->i_size > AFFS_I(inode)->mmu_private) {
828 struct address_space *mapping 828 struct address_space *mapping = inode->i_mapping;
829 struct page *page; 829 struct page *page;
830 void *fsdata; 830 void *fsdata;
831 u32 size = inode->i_size; 831 u32 size = inode->i_size;
832 int res; 832 int res;
833 833
834 res = mapping->a_ops->write_be 834 res = mapping->a_ops->write_begin(NULL, mapping, size, 0, 0, &page, &fsdata);
835 if (!res) 835 if (!res)
836 res = mapping->a_ops-> 836 res = mapping->a_ops->write_end(NULL, mapping, size, 0, 0, page, fsdata);
837 mark_inode_dirty(inode); 837 mark_inode_dirty(inode);
838 return; 838 return;
839 } else if (inode->i_size == AFFS_I(ino 839 } else if (inode->i_size == AFFS_I(inode)->mmu_private)
840 return; 840 return;
841 841
842 // lock cache 842 // lock cache
843 ext_bh = affs_get_extblock(inode, ext) 843 ext_bh = affs_get_extblock(inode, ext);
844 if (IS_ERR(ext_bh)) { 844 if (IS_ERR(ext_bh)) {
845 affs_warning(sb, "truncate", " 845 affs_warning(sb, "truncate", "unexpected read error for ext block %u (%d)",
846 ext, PTR_ERR(ext_ 846 ext, PTR_ERR(ext_bh));
847 return; 847 return;
848 } 848 }
849 if (AFFS_I(inode)->i_lc) { 849 if (AFFS_I(inode)->i_lc) {
850 /* clear linear cache */ 850 /* clear linear cache */
851 i = (ext + 1) >> AFFS_I(inode) 851 i = (ext + 1) >> AFFS_I(inode)->i_lc_shift;
852 if (AFFS_I(inode)->i_lc_size > 852 if (AFFS_I(inode)->i_lc_size > i) {
853 AFFS_I(inode)->i_lc_si 853 AFFS_I(inode)->i_lc_size = i;
854 for (; i < AFFS_LC_SIZ 854 for (; i < AFFS_LC_SIZE; i++)
855 AFFS_I(inode)- 855 AFFS_I(inode)->i_lc[i] = 0;
856 } 856 }
857 /* clear associative cache */ 857 /* clear associative cache */
858 for (i = 0; i < AFFS_AC_SIZE; 858 for (i = 0; i < AFFS_AC_SIZE; i++)
859 if (AFFS_I(inode)->i_a 859 if (AFFS_I(inode)->i_ac[i].ext >= ext)
860 AFFS_I(inode)- 860 AFFS_I(inode)->i_ac[i].ext = 0;
861 } 861 }
862 ext_key = be32_to_cpu(AFFS_TAIL(sb, ex 862 ext_key = be32_to_cpu(AFFS_TAIL(sb, ext_bh)->extension);
863 863
864 blkcnt = AFFS_I(inode)->i_blkcnt; 864 blkcnt = AFFS_I(inode)->i_blkcnt;
865 i = 0; 865 i = 0;
866 blk = last_blk; 866 blk = last_blk;
867 if (inode->i_size) { 867 if (inode->i_size) {
868 i = last_blk % AFFS_SB(sb)->s_ 868 i = last_blk % AFFS_SB(sb)->s_hashsize + 1;
869 blk++; 869 blk++;
870 } else 870 } else
871 AFFS_HEAD(ext_bh)->first_data 871 AFFS_HEAD(ext_bh)->first_data = 0;
872 size = AFFS_SB(sb)->s_hashsize; 872 size = AFFS_SB(sb)->s_hashsize;
873 if (size > blkcnt - blk + i) 873 if (size > blkcnt - blk + i)
874 size = blkcnt - blk + i; 874 size = blkcnt - blk + i;
875 for (; i < size; i++, blk++) { 875 for (; i < size; i++, blk++) {
876 affs_free_block(sb, be32_to_cp 876 affs_free_block(sb, be32_to_cpu(AFFS_BLOCK(sb, ext_bh, i)));
877 AFFS_BLOCK(sb, ext_bh, i) = 0; 877 AFFS_BLOCK(sb, ext_bh, i) = 0;
878 } 878 }
879 AFFS_TAIL(sb, ext_bh)->extension = 0; 879 AFFS_TAIL(sb, ext_bh)->extension = 0;
880 affs_fix_checksum(sb, ext_bh); 880 affs_fix_checksum(sb, ext_bh);
881 mark_buffer_dirty_inode(ext_bh, inode) 881 mark_buffer_dirty_inode(ext_bh, inode);
882 affs_brelse(ext_bh); 882 affs_brelse(ext_bh);
883 883
884 if (inode->i_size) { 884 if (inode->i_size) {
885 AFFS_I(inode)->i_blkcnt = last 885 AFFS_I(inode)->i_blkcnt = last_blk + 1;
886 AFFS_I(inode)->i_extcnt = ext 886 AFFS_I(inode)->i_extcnt = ext + 1;
887 if (AFFS_SB(sb)->s_flags & SF_ 887 if (AFFS_SB(sb)->s_flags & SF_OFS) {
888 struct buffer_head *bh 888 struct buffer_head *bh = affs_bread_ino(inode, last_blk, 0);
889 u32 tmp; 889 u32 tmp;
890 if (IS_ERR(ext_bh)) { 890 if (IS_ERR(ext_bh)) {
891 affs_warning(s 891 affs_warning(sb, "truncate", "unexpected read error for last block %u (%d)",
892 e 892 ext, PTR_ERR(ext_bh));
893 return; 893 return;
894 } 894 }
895 tmp = be32_to_cpu(AFFS 895 tmp = be32_to_cpu(AFFS_DATA_HEAD(bh)->next);
896 AFFS_DATA_HEAD(bh)->ne 896 AFFS_DATA_HEAD(bh)->next = 0;
897 affs_adjust_checksum(b 897 affs_adjust_checksum(bh, -tmp);
898 affs_brelse(bh); 898 affs_brelse(bh);
899 } 899 }
900 } else { 900 } else {
901 AFFS_I(inode)->i_blkcnt = 0; 901 AFFS_I(inode)->i_blkcnt = 0;
902 AFFS_I(inode)->i_extcnt = 1; 902 AFFS_I(inode)->i_extcnt = 1;
903 } 903 }
904 AFFS_I(inode)->mmu_private = inode->i_ 904 AFFS_I(inode)->mmu_private = inode->i_size;
905 // unlock cache 905 // unlock cache
906 906
907 while (ext_key) { 907 while (ext_key) {
908 ext_bh = affs_bread(sb, ext_ke 908 ext_bh = affs_bread(sb, ext_key);
909 size = AFFS_SB(sb)->s_hashsize 909 size = AFFS_SB(sb)->s_hashsize;
910 if (size > blkcnt - blk) 910 if (size > blkcnt - blk)
911 size = blkcnt - blk; 911 size = blkcnt - blk;
912 for (i = 0; i < size; i++, blk 912 for (i = 0; i < size; i++, blk++)
913 affs_free_block(sb, be 913 affs_free_block(sb, be32_to_cpu(AFFS_BLOCK(sb, ext_bh, i)));
914 affs_free_block(sb, ext_key); 914 affs_free_block(sb, ext_key);
915 ext_key = be32_to_cpu(AFFS_TAI 915 ext_key = be32_to_cpu(AFFS_TAIL(sb, ext_bh)->extension);
916 affs_brelse(ext_bh); 916 affs_brelse(ext_bh);
917 } 917 }
918 affs_free_prealloc(inode); 918 affs_free_prealloc(inode);
919 } 919 }
920 920
|
This page was automatically generated by the
LXR engine.
|