Attachment 244573 Details for Bug 267654 – revised proposed fix

[patch] revised proposed fix

diffs (text/plain), 1.28 KB, created by Kirk McKusick on 2023-09-02 06:19:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kirk McKusick

Created: 2023-09-02 06:19:30 UTC

Size: 1.28 KB

patch

obsolete

>diff --git a/lib/libufs/libufs.h b/lib/libufs/libufs.h
>index 4c6242e9daef..2be4c8b90f61 100644
>--- a/lib/libufs/libufs.h
>+++ b/lib/libufs/libufs.h
>@@ -52,20 +52,20 @@ struct uufsd {
> 	uint32_t d_inomin;		/* low ino, not ino_t for ABI compat */
> 	uint32_t d_inomax;		/* high ino, not ino_t for ABI compat */
> 	union dinodep d_dp;		/* pointer to currently active inode */
>-	union {
>-		struct fs d_fs;		/* filesystem information */
>-		char d_sb[MAXBSIZE];	/* superblock as buffer */
>-	} d_sbunion;
>-	union {
>-		struct cg d_cg;		/* cylinder group */
>-		char d_buf[MAXBSIZE];	/* cylinder group storage */
>-	} d_cgunion;
> 	int d_ccg;			/* current cylinder group */
> 	int d_lcg;			/* last cylinder group (in d_cg) */
> 	const char *d_error;		/* human readable disk error */
> 	off_t d_sblockloc;		/* where to look for the superblock */
> 	int d_lookupflags;		/* flags to superblock lookup */
> 	int d_mine;			/* internal flags */
>+	union {
>+		struct fs d_fs;		/* filesystem information */
>+		char d_sb[MAXBSIZE];	/* superblock as buffer */
>+	} d_sbunion __attribute__ ((aligned(64)));
>+	union {
>+		struct cg d_cg;		/* cylinder group */
>+		char d_buf[MAXBSIZE];	/* cylinder group storage */
>+	} d_cgunion __attribute__ ((aligned(64)));
> #define	d_fs	d_sbunion.d_fs
> #define	d_sb	d_sbunion.d_sb
> #define	d_cg	d_cgunion.d_cg

Actions: View | Diff

Attachments on bug 267654: 242385 | 244092 | 244186 | 244220 | 244573