Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-6245 libcfs: remove mem wrappers for libcfs
[fs/lustre-release.git]
/
lustre
/
obdecho
/
echo.c
diff --git
a/lustre/obdecho/echo.c
b/lustre/obdecho/echo.c
index
107fab1
..
a9886ed
100644
(file)
--- a/
lustre/obdecho/echo.c
+++ b/
lustre/obdecho/echo.c
@@
-229,7
+229,7
@@
static void
echo_page_debug_setup(struct page *page, int rw, u64 id,
__u64 offset, int len)
{
echo_page_debug_setup(struct page *page, int rw, u64 id,
__u64 offset, int len)
{
- int page_offset = offset & ~
CFS_
PAGE_MASK;
+ int page_offset = offset & ~PAGE_MASK;
char *addr = ((char *)kmap(page)) + page_offset;
if (len % OBD_ECHO_BLOCK_SIZE != 0)
char *addr = ((char *)kmap(page)) + page_offset;
if (len % OBD_ECHO_BLOCK_SIZE != 0)
@@
-256,7
+256,7
@@
static int
echo_page_debug_check(struct page *page, u64 id,
__u64 offset, int len)
{
echo_page_debug_check(struct page *page, u64 id,
__u64 offset, int len)
{
- int page_offset = offset & ~
CFS_
PAGE_MASK;
+ int page_offset = offset & ~PAGE_MASK;
char *addr = ((char *)kmap(page)) + page_offset;
int rc = 0;
int rc2;
char *addr = ((char *)kmap(page)) + page_offset;
int rc = 0;
int rc2;
@@
-309,7
+309,7
@@
static int echo_map_nb_to_lb(struct obdo *oa, struct obd_ioobj *obj,
res->lnb_file_offset = offset;
res->lnb_len = plen;
res->lnb_file_offset = offset;
res->lnb_len = plen;
- LASSERT((res->lnb_file_offset & ~
CFS_
PAGE_MASK) +
+ LASSERT((res->lnb_file_offset & ~PAGE_MASK) +
res->lnb_len <= PAGE_CACHE_SIZE);
if (ispersistent &&
res->lnb_len <= PAGE_CACHE_SIZE);
if (ispersistent &&