rpms/kernel/FC-5 linux-2.6-ufs-64bit.patch, NONE, 1.1 kernel-2.6.spec, 1.2219, 1.2220

[fedora-cvs-commits at redhat.com]

Author: davej

Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv5234

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-ufs-64bit.patch 
Log Message:
Fix UFS mounts on x86-64 (#209921)

linux-2.6-ufs-64bit.patch:
 ufs_fs.h |    3 +--
 1 files changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE linux-2.6-ufs-64bit.patch ---

ufs2 fails to mount on x86_64, claiming bad magic.  This is because 
ufs_super_block_third's fs_un1 member is padded out by 4 bytes for
8-byte alignment, pushing down the rest of the struct.

Forcing this to be packed solves it.  I took a quick look over
other on-disk structures and didn't immediately find other problems.
I was able to mount & ls a populated ufs2 filesystem w/ this change.

Thanks,
-Eric

Signed-off-by: Eric Sandeen <sandeen at redhat.com>

Index: linux-2.6.18/include/linux/ufs_fs.h
===================================================================
--- linux-2.6.18.orig/include/linux/ufs_fs.h
+++ linux-2.6.18/include/linux/ufs_fs.h
@@ -900,7 +900,7 @@ struct ufs_super_block_third {
 			__fs64   fs_csaddr;	/* blk addr of cyl grp summary area */
 			__fs64    fs_pendingblocks;/* blocks in process of being freed */
 			__fs32    fs_pendinginodes;/*inodes in process of being freed */
-		} fs_u2;
+		} __attribute__ ((packed)) fs_u2;
 	} fs_un1;
 	union {
 		struct {


-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2219
retrieving revision 1.2220
diff -u -r1.2219 -r1.2220
--- kernel-2.6.spec	30 Oct 2006 05:21:13 -0000	1.2219
+++ kernel-2.6.spec	31 Oct 2006 17:17:07 -0000	1.2220
@@ -385,6 +385,8 @@
 
 Patch1460: linux-2.6-cifs-einval-on-readdir-fix.patch
 
+Patch1470: linux-2.6-ufs-64bit.patch
+
 # Device mapper / MD layer
 Patch1500: linux-2.6-dm-mirroring.patch
 
@@ -936,6 +938,9 @@
 # Fix CIFS
 %patch1460 -p1
 
+# Fix UFS on 64bit
+%patch1470 -p1
+
 # Device mapper / MD layer
 # dm mirroring
 %patch1500 -p1
@@ -1641,32 +1646,35 @@
 %endif
 
 %changelog
+* Tue Oct 31 2006 Dave Jones <davej at redhat.com>
+- Fix UFS mounts on x86-64 (#209921)
+
 * Sun Oct 29 2006 Dave Jones <davej at redhat.com>
 - More ext3 robustness fixes.
 - Include more verbose BUG() data
 - x86_64: Fix up C3 timer latency.
 
-* Sat Oct 21 2006 Dave Jones <davej at redhat.com> 
+* Sat Oct 21 2006 Dave Jones <davej at redhat.com>
 - Reenable NCPFS (#211325, #203663)
 - Netpoll fixes. (#199295)
 
-* Fri Oct 20 2006 Dave Jones <davej at redhat.com> 
+* Fri Oct 20 2006 Dave Jones <davej at redhat.com>
 - Fix autofs creating bad dentries in NFS mount. (#211206, #211207)
 - Fix softlockup with ips driver. (#196437)
 - Further exec-shield improvements.
 - Fix lockup with sky2 driver. (#202203)
 
-* Thu Oct 19 2006 Dave Jones <davej at redhat.com> 
+* Thu Oct 19 2006 Dave Jones <davej at redhat.com>
 - Export copy_4K_page for ppc64 (#211410)
 - Attempt to fix CIFS bug (#211070)
 
-* Wed Oct 18 2006 Dave Jones <davej at redhat.com> 
+* Wed Oct 18 2006 Dave Jones <davej at redhat.com>
 - Fix up aic7xxx SBLKCTL register handling (#211251)
 - Disable SECMARK by default. (#211115)
 - Disable some extra debugging stuff that crept in.
 - Remove broken VIA quirk that prevented booting on some EPIAs (#211298)
 
-* Tue Oct 17 2006 Dave Jones <davej at redhat.com> 
+* Tue Oct 17 2006 Dave Jones <davej at redhat.com>
 - Silence noisy boot-time messages. (#180606)
 - Workaround gcc bug with weak symbols (#191458)
 - Don't let speedstep-smi register on mobile Pentium4 (#204477)