diff --git a/[refs] b/[refs] index ad9fd05647c0..7cfa94864a37 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fb719c59bdb4fca86ee1fd1f42ab3735ca12b6b2 +refs/heads/master: 6d31d15f21b376ac0d8a2323fd6673683bc82bd6 diff --git a/trunk/fs/udf/inode.c b/trunk/fs/udf/inode.c index 8266f2ed7fc4..cbae1ed0b7c1 100644 --- a/trunk/fs/udf/inode.c +++ b/trunk/fs/udf/inode.c @@ -587,7 +587,6 @@ static int udf_extend_file(struct inode *inode, loff_t newsize) static sector_t inode_getblk(struct inode *inode, sector_t block, int *err, int *new) { - static sector_t last_block; struct kernel_long_ad laarr[EXTENT_MERGE_SIZE]; struct extent_position prev_epos, cur_epos, next_epos; int count = 0, startnum = 0, endnum = 0; @@ -677,7 +676,6 @@ static sector_t inode_getblk(struct inode *inode, sector_t block, return newblock; } - last_block = block; /* Are we beyond EOF? */ if (etype == -1) { int ret; @@ -719,7 +717,6 @@ static sector_t inode_getblk(struct inode *inode, sector_t block, memset(&laarr[c].extLocation, 0x00, sizeof(struct kernel_lb_addr)); count++; - endnum++; } endnum = c + 1; lastblock = 1;