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

• Lines: 61
• Date: Tue Jan 25 11:19:04 2000
• Orig file: v2.3.40/linux/fs/udf/dir.c
• Orig date: Fri Jan 7 19:13:22 2000

diff -u --recursive --new-file v2.3.40/linux/fs/udf/dir.c linux/fs/udf/dir.c
@@ -67,13 +67,13 @@
 
 struct inode_operations udf_dir_inode_operations = {
 	&udf_dir_operations,
-#ifdef CONFIG_UDF_RW
+#if CONFIG_UDF_RW == 1
 	udf_create, 	/* create */
 #else
 	NULL,			/* create */
 #endif
 	udf_lookup,		/* lookup */
-#ifdef CONFIG_UDF_RW
+#if CONFIG_UDF_RW == 1
 	udf_link,		/* link */
 	udf_unlink,		/* unlink */
 	udf_symlink,	/* symlink */
@@ -139,7 +139,7 @@
 
 	if ( filp->f_pos == 0 ) 
 	{
-		if (filldir(dirent, ".", 1, filp->f_pos, dir->i_ino) < 0)
+		if (filldir(dirent, ".", 1, filp->f_pos, dir->i_ino))
 			return 0;
 	}
  
@@ -161,7 +161,7 @@
 	char *nameptr;
 	Uint16 liu;
 	Uint8 lfi;
-	loff_t size = (UDF_I_EXT0OFFS(dir) + dir->i_size) >> 2;
+	loff_t size = (udf_ext0_offset(dir) + dir->i_size) >> 2;
 	struct buffer_head * bh = NULL;
 	lb_addr bloc, eloc;
 	Uint32 extoffset, elen, offset;
@@ -170,7 +170,7 @@
 		return 1;
 
 	if (nf_pos == 0)
-		nf_pos = (UDF_I_EXT0OFFS(dir) >> 2);
+		nf_pos = (udf_ext0_offset(dir) >> 2);
 
 	fibh.soffset = fibh.eoffset = (nf_pos & ((dir->i_sb->s_blocksize - 1) >> 2)) << 2;
 	if (inode_bmap(dir, nf_pos >> (dir->i_sb->s_blocksize_bits - 2),
@@ -251,7 +251,7 @@
  
  		if (!lfi) /* parent directory */
  		{
-			if (filldir(dirent, "..", 2, filp->f_pos, filp->f_dentry->d_parent->d_inode->i_ino) < 0)
+			if (filldir(dirent, "..", 2, filp->f_pos, filp->f_dentry->d_parent->d_inode->i_ino))
 			{
 				if (fibh.sbh != fibh.ebh)
 					udf_release_data(fibh.ebh);
@@ -264,7 +264,7 @@
 		{
 			if ((flen = udf_get_filename(nameptr, fname, lfi)))
 			{
-				if (filldir(dirent, fname, flen, filp->f_pos, iblock) < 0)
+				if (filldir(dirent, fname, flen, filp->f_pos, iblock))
 				{
 					if (fibh.sbh != fibh.ebh)
 						udf_release_data(fibh.ebh);