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-13731 autoconf: check if VM_FAULT_RETRY is defined
[fs/lustre-release.git]
/
lustre
/
llite
/
vvp_internal.h
diff --git
a/lustre/llite/vvp_internal.h
b/lustre/llite/vvp_internal.h
index
3062208
..
363a0f3
100644
(file)
--- a/
lustre/llite/vvp_internal.h
+++ b/
lustre/llite/vvp_internal.h
@@
-97,9
+97,10
@@
struct vvp_io {
struct {
struct cl_page_list vui_queue;
unsigned long vui_written;
struct {
struct cl_page_list vui_queue;
unsigned long vui_written;
+ unsigned long vui_read;
int vui_from;
int vui_to;
int vui_from;
int vui_to;
- }
write;
+ }
readwrite; /* normal io */
} u;
enum vvp_io_subtype vui_io_subtype;
} u;
enum vvp_io_subtype vui_io_subtype;
@@
-245,7
+246,7
@@
static inline struct vvp_page *cl2vvp_page(const struct cl_page_slice *slice)
static inline pgoff_t vvp_index(struct vvp_page *vpg)
{
static inline pgoff_t vvp_index(struct vvp_page *vpg)
{
- return vpg->vpg_
cl.cpl_
index;
+ return vpg->vpg_
page->
index;
}
struct vvp_device {
}
struct vvp_device {
@@
-260,22
+261,22
@@
static inline struct lu_device *vvp2lu_dev(struct vvp_device *vdv)
static inline struct vvp_device *lu2vvp_dev(const struct lu_device *d)
{
static inline struct vvp_device *lu2vvp_dev(const struct lu_device *d)
{
- return container_of
0
(d, struct vvp_device, vdv_cl.cd_lu_dev);
+ return container_of
_safe
(d, struct vvp_device, vdv_cl.cd_lu_dev);
}
static inline struct vvp_device *cl2vvp_dev(const struct cl_device *d)
{
}
static inline struct vvp_device *cl2vvp_dev(const struct cl_device *d)
{
- return container_of
0
(d, struct vvp_device, vdv_cl);
+ return container_of
_safe
(d, struct vvp_device, vdv_cl);
}
static inline struct vvp_object *cl2vvp(const struct cl_object *obj)
{
}
static inline struct vvp_object *cl2vvp(const struct cl_object *obj)
{
- return container_of
0
(obj, struct vvp_object, vob_cl);
+ return container_of
_safe
(obj, struct vvp_object, vob_cl);
}
static inline struct vvp_object *lu2vvp(const struct lu_object *obj)
{
}
static inline struct vvp_object *lu2vvp(const struct lu_object *obj)
{
- return container_of
0
(obj, struct vvp_object, vob_cl.co_lu);
+ return container_of
_safe
(obj, struct vvp_object, vob_cl.co_lu);
}
static inline struct inode *vvp_object_inode(const struct cl_object *obj)
}
static inline struct inode *vvp_object_inode(const struct cl_object *obj)