patch-2.3.32 linux/include/linux/umsdos_fs_i.h

Next file: linux/include/pcmcia/bulkmem.h
Previous file: linux/include/linux/umsdos_fs.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.31/linux/include/linux/umsdos_fs_i.h linux/include/linux/umsdos_fs_i.h
@@ -47,15 +47,13 @@
 				 *  Only one at a time, although one
 				 *  may recursively lock, so it is a counter
 				 */
-	long pid;		/* pid of the process owning the creation */
-	/* lock */
+	long pid;		/* pid of the process owning the creation
+				 * lock */
 };
 
 struct umsdos_inode_info {
-	union {
-		struct msdos_inode_info msdos_info;
-		struct dir_locking_info dir_info;
-	} u;
+	struct msdos_inode_info msdos_info;
+	struct dir_locking_info dir_info;
 	int i_patched;			/* Inode has been patched */
 	int i_is_hlink;			/* Resolved hardlink inode? */
 	unsigned long i_emd_owner;	/* Is this the EMD file inode? */

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)