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-3321 clio: revert LU-2622 for removing global env list
[fs/lustre-release.git]
/
lustre
/
liblustre
/
llite_cl.c
diff --git
a/lustre/liblustre/llite_cl.c
b/lustre/liblustre/llite_cl.c
index
7374e4b
..
5c7ce91
100644
(file)
--- a/
lustre/liblustre/llite_cl.c
+++ b/
lustre/liblustre/llite_cl.c
@@
-17,7
+17,7
@@
* along with Lustre; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
* along with Lustre; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * Copyright (c) 2011, 201
2
, Intel Corporation.
+ * Copyright (c) 2011, 201
3
, Intel Corporation.
*/
#define DEBUG_SUBSYSTEM S_LLITE
*/
#define DEBUG_SUBSYSTEM S_LLITE
@@
-58,7
+58,7
@@
static int slp_type_init (struct lu_device_type *t);
static void slp_type_fini (struct lu_device_type *t);
static int slp_page_init(const struct lu_env *env, struct cl_object *obj,
static void slp_type_fini (struct lu_device_type *t);
static int slp_page_init(const struct lu_env *env, struct cl_object *obj,
- struct cl_page *page,
cfs_page_t
*vmpage);
+ struct cl_page *page,
struct page
*vmpage);
static int slp_attr_get (const struct lu_env *env, struct cl_object *obj,
struct cl_attr *attr);
static int slp_attr_get (const struct lu_env *env, struct cl_object *obj,
struct cl_attr *attr);
@@
-224,7
+224,7
@@
void slp_global_fini(void)
*/
static int slp_page_init(const struct lu_env *env, struct cl_object *obj,
*/
static int slp_page_init(const struct lu_env *env, struct cl_object *obj,
- struct cl_page *page,
cfs_page_t
*vmpage)
+ struct cl_page *page,
struct page
*vmpage)
{
struct ccc_page *cpg = cl_object_page_slice(obj, page);
{
struct ccc_page *cpg = cl_object_page_slice(obj, page);
@@
-294,7
+294,7
@@
static int slp_attr_get(const struct lu_env *env, struct cl_object *obj,
static void slp_page_fini_common(struct ccc_page *cp)
{
static void slp_page_fini_common(struct ccc_page *cp)
{
-
cfs_page_t
*vmpage = cp->cpg_page;
+
struct page
*vmpage = cp->cpg_page;
LASSERT(vmpage != NULL);
llu_free_user_page(vmpage);
LASSERT(vmpage != NULL);
llu_free_user_page(vmpage);
@@
-497,8
+497,8
@@
static int llu_queue_pio(const struct lu_env *env, struct cl_io *io,
unsigned long index, offset, bytes;
offset = (pos & ~CFS_PAGE_MASK);
unsigned long index, offset, bytes;
offset = (pos & ~CFS_PAGE_MASK);
-
index = pos >> CFS_PAG
E_SHIFT;
-
bytes = CFS_PAG
E_SIZE - offset;
+
index = pos >> PAGE_CACH
E_SHIFT;
+
bytes = PAGE_CACH
E_SIZE - offset;
if (bytes > count)
bytes = count;
if (bytes > count)
bytes = count;
@@
-582,7
+582,8
@@
struct llu_io_group * get_io_group(struct inode *inode, int maxpages,
static int max_io_pages(ssize_t len, int iovlen)
{
static int max_io_pages(ssize_t len, int iovlen)
{
- return (((len + CFS_PAGE_SIZE -1) / CFS_PAGE_SIZE) + 2 + iovlen - 1);
+ return ((len + PAGE_CACHE_SIZE - 1) / PAGE_CACHE_SIZE) +
+ 2 + iovlen - 1;
}
void put_io_group(struct llu_io_group *group)
}
void put_io_group(struct llu_io_group *group)