diff options
Diffstat (limited to 'fs/reiserfs/tail_conversion.c')
-rw-r--r-- | fs/reiserfs/tail_conversion.c | 463 |
1 files changed, 233 insertions, 230 deletions
diff --git a/fs/reiserfs/tail_conversion.c b/fs/reiserfs/tail_conversion.c index 6191909d5165..c92e124f628e 100644 --- a/fs/reiserfs/tail_conversion.c +++ b/fs/reiserfs/tail_conversion.c | |||
@@ -11,156 +11,159 @@ | |||
11 | /* access to tail : when one is going to read tail it must make sure, that is not running. | 11 | /* access to tail : when one is going to read tail it must make sure, that is not running. |
12 | direct2indirect and indirect2direct can not run concurrently */ | 12 | direct2indirect and indirect2direct can not run concurrently */ |
13 | 13 | ||
14 | |||
15 | /* Converts direct items to an unformatted node. Panics if file has no | 14 | /* Converts direct items to an unformatted node. Panics if file has no |
16 | tail. -ENOSPC if no disk space for conversion */ | 15 | tail. -ENOSPC if no disk space for conversion */ |
17 | /* path points to first direct item of the file regarless of how many of | 16 | /* path points to first direct item of the file regarless of how many of |
18 | them are there */ | 17 | them are there */ |
19 | int direct2indirect (struct reiserfs_transaction_handle *th, struct inode * inode, | 18 | int direct2indirect(struct reiserfs_transaction_handle *th, struct inode *inode, |
20 | struct path * path, struct buffer_head * unbh, | 19 | struct path *path, struct buffer_head *unbh, |
21 | loff_t tail_offset) | 20 | loff_t tail_offset) |
22 | { | 21 | { |
23 | struct super_block * sb = inode->i_sb; | 22 | struct super_block *sb = inode->i_sb; |
24 | struct buffer_head *up_to_date_bh ; | 23 | struct buffer_head *up_to_date_bh; |
25 | struct item_head * p_le_ih = PATH_PITEM_HEAD (path); | 24 | struct item_head *p_le_ih = PATH_PITEM_HEAD(path); |
26 | unsigned long total_tail = 0 ; | 25 | unsigned long total_tail = 0; |
27 | struct cpu_key end_key; /* Key to search for the last byte of the | 26 | struct cpu_key end_key; /* Key to search for the last byte of the |
28 | converted item. */ | 27 | converted item. */ |
29 | struct item_head ind_ih; /* new indirect item to be inserted or | 28 | struct item_head ind_ih; /* new indirect item to be inserted or |
30 | key of unfm pointer to be pasted */ | 29 | key of unfm pointer to be pasted */ |
31 | int n_blk_size, | 30 | int n_blk_size, n_retval; /* returned value for reiserfs_insert_item and clones */ |
32 | n_retval; /* returned value for reiserfs_insert_item and clones */ | 31 | unp_t unfm_ptr; /* Handle on an unformatted node |
33 | unp_t unfm_ptr; /* Handle on an unformatted node | 32 | that will be inserted in the |
34 | that will be inserted in the | 33 | tree. */ |
35 | tree. */ | 34 | |
36 | 35 | BUG_ON(!th->t_trans_id); | |
37 | BUG_ON (!th->t_trans_id); | 36 | |
38 | 37 | REISERFS_SB(sb)->s_direct2indirect++; | |
39 | REISERFS_SB(sb)->s_direct2indirect ++; | 38 | |
40 | 39 | n_blk_size = sb->s_blocksize; | |
41 | n_blk_size = sb->s_blocksize; | 40 | |
42 | 41 | /* and key to search for append or insert pointer to the new | |
43 | /* and key to search for append or insert pointer to the new | 42 | unformatted node. */ |
44 | unformatted node. */ | 43 | copy_item_head(&ind_ih, p_le_ih); |
45 | copy_item_head (&ind_ih, p_le_ih); | 44 | set_le_ih_k_offset(&ind_ih, tail_offset); |
46 | set_le_ih_k_offset (&ind_ih, tail_offset); | 45 | set_le_ih_k_type(&ind_ih, TYPE_INDIRECT); |
47 | set_le_ih_k_type (&ind_ih, TYPE_INDIRECT); | 46 | |
48 | 47 | /* Set the key to search for the place for new unfm pointer */ | |
49 | /* Set the key to search for the place for new unfm pointer */ | 48 | make_cpu_key(&end_key, inode, tail_offset, TYPE_INDIRECT, 4); |
50 | make_cpu_key (&end_key, inode, tail_offset, TYPE_INDIRECT, 4); | 49 | |
51 | 50 | // FIXME: we could avoid this | |
52 | // FIXME: we could avoid this | 51 | if (search_for_position_by_key(sb, &end_key, path) == POSITION_FOUND) { |
53 | if ( search_for_position_by_key (sb, &end_key, path) == POSITION_FOUND ) { | 52 | reiserfs_warning(sb, "PAP-14030: direct2indirect: " |
54 | reiserfs_warning (sb, "PAP-14030: direct2indirect: " | 53 | "pasted or inserted byte exists in the tree %K. " |
55 | "pasted or inserted byte exists in the tree %K. " | 54 | "Use fsck to repair.", &end_key); |
56 | "Use fsck to repair.", &end_key); | 55 | pathrelse(path); |
57 | pathrelse(path); | 56 | return -EIO; |
58 | return -EIO; | 57 | } |
59 | } | 58 | |
60 | 59 | p_le_ih = PATH_PITEM_HEAD(path); | |
61 | p_le_ih = PATH_PITEM_HEAD (path); | 60 | |
62 | 61 | unfm_ptr = cpu_to_le32(unbh->b_blocknr); | |
63 | unfm_ptr = cpu_to_le32 (unbh->b_blocknr); | 62 | |
64 | 63 | if (is_statdata_le_ih(p_le_ih)) { | |
65 | if ( is_statdata_le_ih (p_le_ih) ) { | 64 | /* Insert new indirect item. */ |
66 | /* Insert new indirect item. */ | 65 | set_ih_free_space(&ind_ih, 0); /* delete at nearest future */ |
67 | set_ih_free_space (&ind_ih, 0); /* delete at nearest future */ | 66 | put_ih_item_len(&ind_ih, UNFM_P_SIZE); |
68 | put_ih_item_len( &ind_ih, UNFM_P_SIZE ); | 67 | PATH_LAST_POSITION(path)++; |
69 | PATH_LAST_POSITION (path)++; | 68 | n_retval = |
70 | n_retval = reiserfs_insert_item (th, path, &end_key, &ind_ih, inode, | 69 | reiserfs_insert_item(th, path, &end_key, &ind_ih, inode, |
71 | (char *)&unfm_ptr); | 70 | (char *)&unfm_ptr); |
72 | } else { | ||
73 | /* Paste into last indirect item of an object. */ | ||
74 | n_retval = reiserfs_paste_into_item(th, path, &end_key, inode, | ||
75 | (char *)&unfm_ptr, UNFM_P_SIZE); | ||
76 | } | ||
77 | if ( n_retval ) { | ||
78 | return n_retval; | ||
79 | } | ||
80 | |||
81 | // note: from here there are two keys which have matching first | ||
82 | // three key components. They only differ by the fourth one. | ||
83 | |||
84 | |||
85 | /* Set the key to search for the direct items of the file */ | ||
86 | make_cpu_key (&end_key, inode, max_reiserfs_offset (inode), TYPE_DIRECT, 4); | ||
87 | |||
88 | /* Move bytes from the direct items to the new unformatted node | ||
89 | and delete them. */ | ||
90 | while (1) { | ||
91 | int tail_size; | ||
92 | |||
93 | /* end_key.k_offset is set so, that we will always have found | ||
94 | last item of the file */ | ||
95 | if ( search_for_position_by_key (sb, &end_key, path) == POSITION_FOUND ) | ||
96 | reiserfs_panic (sb, "PAP-14050: direct2indirect: " | ||
97 | "direct item (%K) not found", &end_key); | ||
98 | p_le_ih = PATH_PITEM_HEAD (path); | ||
99 | RFALSE( !is_direct_le_ih (p_le_ih), | ||
100 | "vs-14055: direct item expected(%K), found %h", | ||
101 | &end_key, p_le_ih); | ||
102 | tail_size = (le_ih_k_offset (p_le_ih) & (n_blk_size - 1)) | ||
103 | + ih_item_len(p_le_ih) - 1; | ||
104 | |||
105 | /* we only send the unbh pointer if the buffer is not up to date. | ||
106 | ** this avoids overwriting good data from writepage() with old data | ||
107 | ** from the disk or buffer cache | ||
108 | ** Special case: unbh->b_page will be NULL if we are coming through | ||
109 | ** DIRECT_IO handler here. | ||
110 | */ | ||
111 | if (!unbh->b_page || buffer_uptodate(unbh) || PageUptodate(unbh->b_page)) { | ||
112 | up_to_date_bh = NULL ; | ||
113 | } else { | 71 | } else { |
114 | up_to_date_bh = unbh ; | 72 | /* Paste into last indirect item of an object. */ |
73 | n_retval = reiserfs_paste_into_item(th, path, &end_key, inode, | ||
74 | (char *)&unfm_ptr, | ||
75 | UNFM_P_SIZE); | ||
115 | } | 76 | } |
116 | n_retval = reiserfs_delete_item (th, path, &end_key, inode, | 77 | if (n_retval) { |
117 | up_to_date_bh) ; | 78 | return n_retval; |
118 | 79 | } | |
119 | total_tail += n_retval ; | 80 | // note: from here there are two keys which have matching first |
120 | if (tail_size == n_retval) | 81 | // three key components. They only differ by the fourth one. |
121 | // done: file does not have direct items anymore | 82 | |
122 | break; | 83 | /* Set the key to search for the direct items of the file */ |
123 | 84 | make_cpu_key(&end_key, inode, max_reiserfs_offset(inode), TYPE_DIRECT, | |
124 | } | 85 | 4); |
125 | /* if we've copied bytes from disk into the page, we need to zero | 86 | |
126 | ** out the unused part of the block (it was not up to date before) | 87 | /* Move bytes from the direct items to the new unformatted node |
127 | */ | 88 | and delete them. */ |
128 | if (up_to_date_bh) { | 89 | while (1) { |
129 | unsigned pgoff = (tail_offset + total_tail - 1) & (PAGE_CACHE_SIZE - 1); | 90 | int tail_size; |
130 | char *kaddr=kmap_atomic(up_to_date_bh->b_page, KM_USER0); | 91 | |
131 | memset(kaddr + pgoff, 0, n_blk_size - total_tail) ; | 92 | /* end_key.k_offset is set so, that we will always have found |
132 | kunmap_atomic(kaddr, KM_USER0); | 93 | last item of the file */ |
133 | } | 94 | if (search_for_position_by_key(sb, &end_key, path) == |
134 | 95 | POSITION_FOUND) | |
135 | REISERFS_I(inode)->i_first_direct_byte = U32_MAX; | 96 | reiserfs_panic(sb, |
136 | 97 | "PAP-14050: direct2indirect: " | |
137 | return 0; | 98 | "direct item (%K) not found", &end_key); |
138 | } | 99 | p_le_ih = PATH_PITEM_HEAD(path); |
100 | RFALSE(!is_direct_le_ih(p_le_ih), | ||
101 | "vs-14055: direct item expected(%K), found %h", | ||
102 | &end_key, p_le_ih); | ||
103 | tail_size = (le_ih_k_offset(p_le_ih) & (n_blk_size - 1)) | ||
104 | + ih_item_len(p_le_ih) - 1; | ||
105 | |||
106 | /* we only send the unbh pointer if the buffer is not up to date. | ||
107 | ** this avoids overwriting good data from writepage() with old data | ||
108 | ** from the disk or buffer cache | ||
109 | ** Special case: unbh->b_page will be NULL if we are coming through | ||
110 | ** DIRECT_IO handler here. | ||
111 | */ | ||
112 | if (!unbh->b_page || buffer_uptodate(unbh) | ||
113 | || PageUptodate(unbh->b_page)) { | ||
114 | up_to_date_bh = NULL; | ||
115 | } else { | ||
116 | up_to_date_bh = unbh; | ||
117 | } | ||
118 | n_retval = reiserfs_delete_item(th, path, &end_key, inode, | ||
119 | up_to_date_bh); | ||
120 | |||
121 | total_tail += n_retval; | ||
122 | if (tail_size == n_retval) | ||
123 | // done: file does not have direct items anymore | ||
124 | break; | ||
139 | 125 | ||
126 | } | ||
127 | /* if we've copied bytes from disk into the page, we need to zero | ||
128 | ** out the unused part of the block (it was not up to date before) | ||
129 | */ | ||
130 | if (up_to_date_bh) { | ||
131 | unsigned pgoff = | ||
132 | (tail_offset + total_tail - 1) & (PAGE_CACHE_SIZE - 1); | ||
133 | char *kaddr = kmap_atomic(up_to_date_bh->b_page, KM_USER0); | ||
134 | memset(kaddr + pgoff, 0, n_blk_size - total_tail); | ||
135 | kunmap_atomic(kaddr, KM_USER0); | ||
136 | } | ||
137 | |||
138 | REISERFS_I(inode)->i_first_direct_byte = U32_MAX; | ||
139 | |||
140 | return 0; | ||
141 | } | ||
140 | 142 | ||
141 | /* stolen from fs/buffer.c */ | 143 | /* stolen from fs/buffer.c */ |
142 | void reiserfs_unmap_buffer(struct buffer_head *bh) { | 144 | void reiserfs_unmap_buffer(struct buffer_head *bh) |
143 | lock_buffer(bh) ; | 145 | { |
144 | if (buffer_journaled(bh) || buffer_journal_dirty(bh)) { | 146 | lock_buffer(bh); |
145 | BUG() ; | 147 | if (buffer_journaled(bh) || buffer_journal_dirty(bh)) { |
146 | } | 148 | BUG(); |
147 | clear_buffer_dirty(bh) ; | 149 | } |
148 | /* Remove the buffer from whatever list it belongs to. We are mostly | 150 | clear_buffer_dirty(bh); |
149 | interested in removing it from per-sb j_dirty_buffers list, to avoid | 151 | /* Remove the buffer from whatever list it belongs to. We are mostly |
150 | BUG() on attempt to write not mapped buffer */ | 152 | interested in removing it from per-sb j_dirty_buffers list, to avoid |
151 | if ( (!list_empty(&bh->b_assoc_buffers) || bh->b_private) && bh->b_page) { | 153 | BUG() on attempt to write not mapped buffer */ |
152 | struct inode *inode = bh->b_page->mapping->host; | 154 | if ((!list_empty(&bh->b_assoc_buffers) || bh->b_private) && bh->b_page) { |
153 | struct reiserfs_journal *j = SB_JOURNAL(inode->i_sb); | 155 | struct inode *inode = bh->b_page->mapping->host; |
154 | spin_lock(&j->j_dirty_buffers_lock); | 156 | struct reiserfs_journal *j = SB_JOURNAL(inode->i_sb); |
155 | list_del_init(&bh->b_assoc_buffers); | 157 | spin_lock(&j->j_dirty_buffers_lock); |
156 | reiserfs_free_jh(bh); | 158 | list_del_init(&bh->b_assoc_buffers); |
157 | spin_unlock(&j->j_dirty_buffers_lock); | 159 | reiserfs_free_jh(bh); |
158 | } | 160 | spin_unlock(&j->j_dirty_buffers_lock); |
159 | clear_buffer_mapped(bh) ; | 161 | } |
160 | clear_buffer_req(bh) ; | 162 | clear_buffer_mapped(bh); |
161 | clear_buffer_new(bh); | 163 | clear_buffer_req(bh); |
162 | bh->b_bdev = NULL; | 164 | clear_buffer_new(bh); |
163 | unlock_buffer(bh) ; | 165 | bh->b_bdev = NULL; |
166 | unlock_buffer(bh); | ||
164 | } | 167 | } |
165 | 168 | ||
166 | /* this first locks inode (neither reads nor sync are permitted), | 169 | /* this first locks inode (neither reads nor sync are permitted), |
@@ -169,108 +172,108 @@ void reiserfs_unmap_buffer(struct buffer_head *bh) { | |||
169 | what we expect from it (number of cut bytes). But when tail remains | 172 | what we expect from it (number of cut bytes). But when tail remains |
170 | in the unformatted node, we set mode to SKIP_BALANCING and unlock | 173 | in the unformatted node, we set mode to SKIP_BALANCING and unlock |
171 | inode */ | 174 | inode */ |
172 | int indirect2direct (struct reiserfs_transaction_handle *th, | 175 | int indirect2direct(struct reiserfs_transaction_handle *th, struct inode *p_s_inode, struct page *page, struct path *p_s_path, /* path to the indirect item. */ |
173 | struct inode * p_s_inode, | 176 | const struct cpu_key *p_s_item_key, /* Key to look for unformatted node pointer to be cut. */ |
174 | struct page *page, | 177 | loff_t n_new_file_size, /* New file size. */ |
175 | struct path * p_s_path, /* path to the indirect item. */ | 178 | char *p_c_mode) |
176 | const struct cpu_key * p_s_item_key, /* Key to look for unformatted node pointer to be cut. */ | ||
177 | loff_t n_new_file_size, /* New file size. */ | ||
178 | char * p_c_mode) | ||
179 | { | 179 | { |
180 | struct super_block * p_s_sb = p_s_inode->i_sb; | 180 | struct super_block *p_s_sb = p_s_inode->i_sb; |
181 | struct item_head s_ih; | 181 | struct item_head s_ih; |
182 | unsigned long n_block_size = p_s_sb->s_blocksize; | 182 | unsigned long n_block_size = p_s_sb->s_blocksize; |
183 | char * tail; | 183 | char *tail; |
184 | int tail_len, round_tail_len; | 184 | int tail_len, round_tail_len; |
185 | loff_t pos, pos1; /* position of first byte of the tail */ | 185 | loff_t pos, pos1; /* position of first byte of the tail */ |
186 | struct cpu_key key; | 186 | struct cpu_key key; |
187 | 187 | ||
188 | BUG_ON (!th->t_trans_id); | 188 | BUG_ON(!th->t_trans_id); |
189 | 189 | ||
190 | REISERFS_SB(p_s_sb)->s_indirect2direct ++; | 190 | REISERFS_SB(p_s_sb)->s_indirect2direct++; |
191 | 191 | ||
192 | *p_c_mode = M_SKIP_BALANCING; | 192 | *p_c_mode = M_SKIP_BALANCING; |
193 | 193 | ||
194 | /* store item head path points to. */ | 194 | /* store item head path points to. */ |
195 | copy_item_head (&s_ih, PATH_PITEM_HEAD(p_s_path)); | ||
196 | |||
197 | tail_len = (n_new_file_size & (n_block_size - 1)); | ||
198 | if (get_inode_sd_version (p_s_inode) == STAT_DATA_V2) | ||
199 | round_tail_len = ROUND_UP (tail_len); | ||
200 | else | ||
201 | round_tail_len = tail_len; | ||
202 | |||
203 | pos = le_ih_k_offset (&s_ih) - 1 + (ih_item_len(&s_ih) / UNFM_P_SIZE - 1) * p_s_sb->s_blocksize; | ||
204 | pos1 = pos; | ||
205 | |||
206 | // we are protected by i_sem. The tail can not disapper, not | ||
207 | // append can be done either | ||
208 | // we are in truncate or packing tail in file_release | ||
209 | |||
210 | tail = (char *)kmap(page) ; /* this can schedule */ | ||
211 | |||
212 | if (path_changed (&s_ih, p_s_path)) { | ||
213 | /* re-search indirect item */ | ||
214 | if ( search_for_position_by_key (p_s_sb, p_s_item_key, p_s_path) == POSITION_NOT_FOUND ) | ||
215 | reiserfs_panic(p_s_sb, "PAP-5520: indirect2direct: " | ||
216 | "item to be converted %K does not exist", p_s_item_key); | ||
217 | copy_item_head(&s_ih, PATH_PITEM_HEAD(p_s_path)); | 195 | copy_item_head(&s_ih, PATH_PITEM_HEAD(p_s_path)); |
196 | |||
197 | tail_len = (n_new_file_size & (n_block_size - 1)); | ||
198 | if (get_inode_sd_version(p_s_inode) == STAT_DATA_V2) | ||
199 | round_tail_len = ROUND_UP(tail_len); | ||
200 | else | ||
201 | round_tail_len = tail_len; | ||
202 | |||
203 | pos = | ||
204 | le_ih_k_offset(&s_ih) - 1 + (ih_item_len(&s_ih) / UNFM_P_SIZE - | ||
205 | 1) * p_s_sb->s_blocksize; | ||
206 | pos1 = pos; | ||
207 | |||
208 | // we are protected by i_sem. The tail can not disapper, not | ||
209 | // append can be done either | ||
210 | // we are in truncate or packing tail in file_release | ||
211 | |||
212 | tail = (char *)kmap(page); /* this can schedule */ | ||
213 | |||
214 | if (path_changed(&s_ih, p_s_path)) { | ||
215 | /* re-search indirect item */ | ||
216 | if (search_for_position_by_key(p_s_sb, p_s_item_key, p_s_path) | ||
217 | == POSITION_NOT_FOUND) | ||
218 | reiserfs_panic(p_s_sb, | ||
219 | "PAP-5520: indirect2direct: " | ||
220 | "item to be converted %K does not exist", | ||
221 | p_s_item_key); | ||
222 | copy_item_head(&s_ih, PATH_PITEM_HEAD(p_s_path)); | ||
218 | #ifdef CONFIG_REISERFS_CHECK | 223 | #ifdef CONFIG_REISERFS_CHECK |
219 | pos = le_ih_k_offset (&s_ih) - 1 + | 224 | pos = le_ih_k_offset(&s_ih) - 1 + |
220 | (ih_item_len(&s_ih) / UNFM_P_SIZE - 1) * p_s_sb->s_blocksize; | 225 | (ih_item_len(&s_ih) / UNFM_P_SIZE - |
221 | if (pos != pos1) | 226 | 1) * p_s_sb->s_blocksize; |
222 | reiserfs_panic (p_s_sb, "vs-5530: indirect2direct: " | 227 | if (pos != pos1) |
223 | "tail position changed while we were reading it"); | 228 | reiserfs_panic(p_s_sb, "vs-5530: indirect2direct: " |
229 | "tail position changed while we were reading it"); | ||
224 | #endif | 230 | #endif |
225 | } | 231 | } |
226 | |||
227 | |||
228 | /* Set direct item header to insert. */ | ||
229 | make_le_item_head (&s_ih, NULL, get_inode_item_key_version (p_s_inode), pos1 + 1, | ||
230 | TYPE_DIRECT, round_tail_len, 0xffff/*ih_free_space*/); | ||
231 | |||
232 | /* we want a pointer to the first byte of the tail in the page. | ||
233 | ** the page was locked and this part of the page was up to date when | ||
234 | ** indirect2direct was called, so we know the bytes are still valid | ||
235 | */ | ||
236 | tail = tail + (pos & (PAGE_CACHE_SIZE - 1)) ; | ||
237 | |||
238 | PATH_LAST_POSITION(p_s_path)++; | ||
239 | |||
240 | key = *p_s_item_key; | ||
241 | set_cpu_key_k_type (&key, TYPE_DIRECT); | ||
242 | key.key_length = 4; | ||
243 | /* Insert tail as new direct item in the tree */ | ||
244 | if ( reiserfs_insert_item(th, p_s_path, &key, &s_ih, p_s_inode, | ||
245 | tail ? tail : NULL) < 0 ) { | ||
246 | /* No disk memory. So we can not convert last unformatted node | ||
247 | to the direct item. In this case we used to adjust | ||
248 | indirect items's ih_free_space. Now ih_free_space is not | ||
249 | used, it would be ideal to write zeros to corresponding | ||
250 | unformatted node. For now i_size is considered as guard for | ||
251 | going out of file size */ | ||
252 | kunmap(page) ; | ||
253 | return n_block_size - round_tail_len; | ||
254 | } | ||
255 | kunmap(page) ; | ||
256 | |||
257 | /* make sure to get the i_blocks changes from reiserfs_insert_item */ | ||
258 | reiserfs_update_sd(th, p_s_inode); | ||
259 | 232 | ||
260 | // note: we have now the same as in above direct2indirect | 233 | /* Set direct item header to insert. */ |
261 | // conversion: there are two keys which have matching first three | 234 | make_le_item_head(&s_ih, NULL, get_inode_item_key_version(p_s_inode), |
262 | // key components. They only differ by the fouhth one. | 235 | pos1 + 1, TYPE_DIRECT, round_tail_len, |
236 | 0xffff /*ih_free_space */ ); | ||
237 | |||
238 | /* we want a pointer to the first byte of the tail in the page. | ||
239 | ** the page was locked and this part of the page was up to date when | ||
240 | ** indirect2direct was called, so we know the bytes are still valid | ||
241 | */ | ||
242 | tail = tail + (pos & (PAGE_CACHE_SIZE - 1)); | ||
243 | |||
244 | PATH_LAST_POSITION(p_s_path)++; | ||
245 | |||
246 | key = *p_s_item_key; | ||
247 | set_cpu_key_k_type(&key, TYPE_DIRECT); | ||
248 | key.key_length = 4; | ||
249 | /* Insert tail as new direct item in the tree */ | ||
250 | if (reiserfs_insert_item(th, p_s_path, &key, &s_ih, p_s_inode, | ||
251 | tail ? tail : NULL) < 0) { | ||
252 | /* No disk memory. So we can not convert last unformatted node | ||
253 | to the direct item. In this case we used to adjust | ||
254 | indirect items's ih_free_space. Now ih_free_space is not | ||
255 | used, it would be ideal to write zeros to corresponding | ||
256 | unformatted node. For now i_size is considered as guard for | ||
257 | going out of file size */ | ||
258 | kunmap(page); | ||
259 | return n_block_size - round_tail_len; | ||
260 | } | ||
261 | kunmap(page); | ||
263 | 262 | ||
264 | /* We have inserted new direct item and must remove last | 263 | /* make sure to get the i_blocks changes from reiserfs_insert_item */ |
265 | unformatted node. */ | 264 | reiserfs_update_sd(th, p_s_inode); |
266 | *p_c_mode = M_CUT; | ||
267 | 265 | ||
268 | /* we store position of first direct item in the in-core inode */ | 266 | // note: we have now the same as in above direct2indirect |
269 | //mark_file_with_tail (p_s_inode, pos1 + 1); | 267 | // conversion: there are two keys which have matching first three |
270 | REISERFS_I(p_s_inode)->i_first_direct_byte = pos1 + 1; | 268 | // key components. They only differ by the fouhth one. |
271 | |||
272 | return n_block_size - round_tail_len; | ||
273 | } | ||
274 | 269 | ||
270 | /* We have inserted new direct item and must remove last | ||
271 | unformatted node. */ | ||
272 | *p_c_mode = M_CUT; | ||
275 | 273 | ||
274 | /* we store position of first direct item in the in-core inode */ | ||
275 | //mark_file_with_tail (p_s_inode, pos1 + 1); | ||
276 | REISERFS_I(p_s_inode)->i_first_direct_byte = pos1 + 1; | ||
276 | 277 | ||
278 | return n_block_size - round_tail_len; | ||
279 | } | ||