diff options
| author | Dave Kleikamp <dave.kleikamp@oracle.com> | 2023-10-05 09:16:14 -0500 |
|---|---|---|
| committer | Dave Kleikamp <dave.kleikamp@oracle.com> | 2023-10-13 10:39:25 -0500 |
| commit | a779ed754e52d582b8c0e17959df063108bd0656 (patch) | |
| tree | 46f5c794994fd4f195f2bb07e82931f414bc6a3f /fs/jfs/jfs_imap.c | |
| parent | 05d9ea1ceb62a55af6727a69269a4fd310edf483 (diff) | |
| download | lwn-a779ed754e52d582b8c0e17959df063108bd0656.tar.gz lwn-a779ed754e52d582b8c0e17959df063108bd0656.zip | |
jfs: define xtree root and page independently
In order to make array bounds checking sane, provide a separate
definition of the in-inode xtree root and the external xtree page.
Signed-off-by: Dave Kleikamp <dave.kleikamp@oracle.com>
Tested-by: Manas Ghandat <ghandatmanas@gmail.com>
Diffstat (limited to 'fs/jfs/jfs_imap.c')
| -rw-r--r-- | fs/jfs/jfs_imap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/jfs/jfs_imap.c b/fs/jfs/jfs_imap.c index 1b267eec3f36..394e0af0e5df 100644 --- a/fs/jfs/jfs_imap.c +++ b/fs/jfs/jfs_imap.c @@ -670,7 +670,7 @@ int diWrite(tid_t tid, struct inode *ip) * This is the special xtree inside the directory for storing * the directory table */ - xtpage_t *p, *xp; + xtroot_t *p, *xp; xad_t *xad; jfs_ip->xtlid = 0; @@ -684,7 +684,7 @@ int diWrite(tid_t tid, struct inode *ip) * copy xtree root from inode to dinode: */ p = &jfs_ip->i_xtroot; - xp = (xtpage_t *) &dp->di_dirtable; + xp = (xtroot_t *) &dp->di_dirtable; lv = ilinelock->lv; for (n = 0; n < ilinelock->index; n++, lv++) { memcpy(&xp->xad[lv->offset], &p->xad[lv->offset], @@ -713,7 +713,7 @@ int diWrite(tid_t tid, struct inode *ip) * regular file: 16 byte (XAD slot) granularity */ if (type & tlckXTREE) { - xtpage_t *p, *xp; + xtroot_t *p, *xp; xad_t *xad; /* |