summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiles Bader <miles@gnu.org>1995-04-11 22:35:23 +0000
committerMiles Bader <miles@gnu.org>1995-04-11 22:35:23 +0000
commit24f81ad4211e79c1f11d2499beb4c100e6b43934 (patch)
tree95cb7acfec87967f5a16eb61f6ef45beba5b7cb9
parentb64f655e3ee50f88e35f8d526d7e41571ea71b6c (diff)
Formerly pager.c.~4~
-rw-r--r--ext2fs/pager.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/ext2fs/pager.c b/ext2fs/pager.c
index 8dd5c2ab..e0972af6 100644
--- a/ext2fs/pager.c
+++ b/ext2fs/pager.c
@@ -55,7 +55,7 @@ find_address (struct user_pager_info *upi,
struct iblock_spec indirs[NIADDR + 1];
struct node *np;
- np = upi->u.np;
+ np = upi->np;
rwlock_reader_lock (&np->dn->allocptrlock);
*nplock = &np->dn->allocptrlock;
@@ -194,7 +194,7 @@ pager_unlock_page (struct user_pager_info *pager,
if (pager->type == DISK)
return 0;
- np = pager->u.np;
+ np = pager->np;
dn = np->dn;
di = dino (dn->number);
@@ -345,7 +345,7 @@ pager_report_extent (struct user_pager_info *pager,
if (pager->type == DISK)
*size = diskpagersize;
else
- *size = pager->u.np->allocsize;
+ *size = pager->np->allocsize;
return 0;
}
@@ -357,9 +357,9 @@ pager_clear_user_data (struct user_pager_info *upi)
{
assert (upi->type == FILE_DATA);
spin_lock (&node2pagelock);
- upi->u.np->dn->fileinfo = 0;
+ upi->np->dn->fileinfo = 0;
spin_unlock (&node2pagelock);
- diskfs_nrele_light (upi->u.np);
+ diskfs_nrele_light (upi->np);
*upi->prevp = upi->next;
if (upi->next)
upi->next->prevp = upi->prevp;
@@ -374,7 +374,7 @@ create_disk_pager ()
{
diskpager = malloc (sizeof (struct user_pager_info));
diskpager->type = DISK;
- diskpager->u.np = 0;
+ diskpager->np = 0;
diskpager->p = pager_create (diskpager, MAY_CACHE, MEMORY_OBJECT_COPY_NONE);
diskpagerport = pager_get_port (diskpager->p);
mach_port_insert_right (mach_task_self (), diskpagerport, diskpagerport,
@@ -432,7 +432,7 @@ diskfs_get_filemap (struct node *np)
{
upi = malloc (sizeof (struct user_pager_info));
upi->type = FILE_DATA;
- upi->u.np = np;
+ upi->np = np;
diskfs_nref_light (np);
upi->p = pager_create (upi, MAY_CACHE, MEMORY_OBJECT_COPY_DELAY);
np->dn->fileinfo = upi;