patch-2.3.25 linux/fs/udf/dir.c

• Lines: 28
• Date: Sat Oct 30 09:42:30 1999
• Orig file: v2.3.24/linux/fs/udf/dir.c
• Orig date: Tue Sep 7 12:14:07 1999

diff -u --recursive --new-file v2.3.24/linux/fs/udf/dir.c linux/fs/udf/dir.c
@@ -180,7 +180,7 @@
 		&bloc, &extoffset, &eloc, &elen, &offset, &bh) == EXTENT_RECORDED_ALLOCATED)
 	{
 		block = udf_get_lb_pblock(dir->i_sb, eloc, offset);
-		if (++offset < (elen >> dir->i_sb->s_blocksize_bits))
+		if ((++offset << dir->i_sb->s_blocksize_bits) < elen)
 		{
 			if (UDF_I_ALLOCTYPE(dir) == ICB_FLAG_AD_SHORT)
 				extoffset -= sizeof(short_ad);
@@ -207,8 +207,6 @@
 		filp->f_pos = nf_pos;
 
 		fi = udf_fileident_read(dir, &nf_pos, &fibh, &cfi, &bloc, &extoffset, &offset, &bh);
-		liu = le16_to_cpu(cfi.lengthOfImpUse);
-		lfi = cfi.lengthFileIdent;
 
 		if (!fi)
 		{
@@ -218,6 +216,9 @@
 			udf_release_data(bh);
 			return 1;
 		}
+
+		liu = le16_to_cpu(cfi.lengthOfImpUse);
+		lfi = cfi.lengthFileIdent;
 
 		if (fibh.sbh == fibh.ebh)
 			nameptr = fi->fileIdent + liu;