|
@@ -251,7 +251,6 @@ static int _get_block_create_0(struct inode *inode, sector_t block,
|
|
|
struct cpu_key key;
|
|
|
struct buffer_head *bh;
|
|
|
struct item_head *ih, tmp_ih;
|
|
|
- int fs_gen;
|
|
|
b_blocknr_t blocknr;
|
|
|
char *p = NULL;
|
|
|
int chars;
|
|
@@ -265,7 +264,6 @@ static int _get_block_create_0(struct inode *inode, sector_t block,
|
|
|
(loff_t) block * inode->i_sb->s_blocksize + 1, TYPE_ANY,
|
|
|
3);
|
|
|
|
|
|
- research:
|
|
|
result = search_for_position_by_key(inode->i_sb, &key, &path);
|
|
|
if (result != POSITION_FOUND) {
|
|
|
pathrelse(&path);
|
|
@@ -340,7 +338,6 @@ static int _get_block_create_0(struct inode *inode, sector_t block,
|
|
|
}
|
|
|
// read file tail into part of page
|
|
|
offset = (cpu_key_k_offset(&key) - 1) & (PAGE_CACHE_SIZE - 1);
|
|
|
- fs_gen = get_generation(inode->i_sb);
|
|
|
copy_item_head(&tmp_ih, ih);
|
|
|
|
|
|
/* we only want to kmap if we are reading the tail into the page.
|
|
@@ -348,13 +345,9 @@ static int _get_block_create_0(struct inode *inode, sector_t block,
|
|
|
** sure we need to. But, this means the item might move if
|
|
|
** kmap schedules
|
|
|
*/
|
|
|
- if (!p) {
|
|
|
+ if (!p)
|
|
|
p = (char *)kmap(bh_result->b_page);
|
|
|
- if (fs_changed(fs_gen, inode->i_sb)
|
|
|
- && item_moved(&tmp_ih, &path)) {
|
|
|
- goto research;
|
|
|
- }
|
|
|
- }
|
|
|
+
|
|
|
p += offset;
|
|
|
memset(p, 0, inode->i_sb->s_blocksize);
|
|
|
do {
|