rpms/kernel/F-7 kernel-2.6.spec, 1.3185, 1.3186 linux-2.6-mm-udf-fixes.patch, 1.1, 1.2

[Dave Jones (davej)]

Author: davej

Update of /cvs/pkgs/rpms/kernel/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16313

Modified Files:
	kernel-2.6.spec linux-2.6-mm-udf-fixes.patch 
Log Message:
Fix up rejects in udf>4g patch and 2.6.21.2rc1


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/kernel-2.6.spec,v
retrieving revision 1.3185
retrieving revision 1.3186
diff -u -r1.3185 -r1.3186
--- kernel-2.6.spec	22 May 2007 04:08:25 -0000	1.3185
+++ kernel-2.6.spec	22 May 2007 04:16:47 -0000	1.3186
@@ -1320,7 +1320,7 @@
 # Allow to use 480600 baud on 16C950 UARTs
 %patch1650 -p1
 # Allow large files on UDF
-#%patch1660 -p1
+%patch1660 -p1
 # fix oops in sysfs_readdir
 %patch1670 -p1
 # Fix XFS umount bug.

linux-2.6-mm-udf-fixes.patch:

Index: linux-2.6-mm-udf-fixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/linux-2.6-mm-udf-fixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-mm-udf-fixes.patch	27 Apr 2007 21:10:09 -0000	1.1
+++ linux-2.6-mm-udf-fixes.patch	22 May 2007 04:16:47 -0000	1.2
@@ -1690,14 +1690,7 @@
  	return 1;
  }
  
-@@ -878,14 +878,14 @@ static int udf_rmdir(struct inode * dir,
- 			inode->i_nlink);
- 	clear_nlink(inode);
- 	inode->i_size = 0;
--	inode_dec_link_count(inode);
-+	inode_dec_link_count(dir);
- 	inode->i_ctime = dir->i_ctime = dir->i_mtime = current_fs_time(dir->i_sb);
- 	mark_inode_dirty(dir);
+@@ -884,8 +884,8 @@ static int udf_rmdir(struct inode * dir,
  
  end_rmdir:
  	if (fibh.sbh != fibh.ebh)