1.1 --- a/libfsserver/lib/generic/pager.cc Sun May 29 00:58:31 2022 +0200
1.2 +++ b/libfsserver/lib/generic/pager.cc Mon May 30 00:47:07 2022 +0200
1.3 @@ -31,11 +31,11 @@
1.4 /* Initialise the pager with a page mapper and the given flags controlling
1.5 access to a file. */
1.6
1.7 -Pager::Pager(GenericPageMapper *mapper, map_flags_t flags)
1.8 +Pager::Pager(GenericPageMapper *mapper, map_flags_t map_flags)
1.9 : _start(0), _size(0),
1.10 _mapper(mapper), _mapper_base(mapper), _mapper_masked(NULL),
1.11 _mapper_copied(NULL),
1.12 - _flags(flags)
1.13 + _map_flags(map_flags)
1.14 {
1.15 }
1.16
1.17 @@ -113,7 +113,7 @@
1.18 /* Map a flexpage corresponding to the dataspace 'offset' involving a 'hot_spot'
1.19 (flexpage offset). */
1.20
1.21 -long Pager::map(offset_t offset, address_t hot_spot, map_flags_t flags,
1.22 +long Pager::map(offset_t offset, address_t hot_spot, map_flags_t map_flags,
1.23 l4_snd_fpage_t *region)
1.24 {
1.25 offset_t file_offset = _start + offset;
1.26 @@ -123,17 +123,17 @@
1.27 NOTE: Permitting executable requests here. This needs to be configured
1.28 when opening the pager or by another means. */
1.29
1.30 - if (flags & (~(_flags | L4RE_DS_F_X)))
1.31 + if (map_flags & (~(_map_flags | L4RE_DS_F_X)))
1.32 return -L4_EACCESS;
1.33
1.34 /* Obtain a flexpage from the page mapper. */
1.35
1.36 - Flexpage *flexpage = _mapper->get(file_offset, flags);
1.37 + Flexpage *flexpage = _mapper->get(file_offset, map_flags);
1.38
1.39 /* Issue the flexpage via the IPC system. */
1.40
1.41 long err = ipc_prepare_flexpage(flexpage, file_offset, max_offset,
1.42 - hot_spot, flags, region);
1.43 + hot_spot, map_flags, region);
1.44
1.45 if (!err)
1.46 err = complete_Dataspace_map(*region);