*
* You should have received a copy of the GNU General Public License
* version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
*
* GPL HEADER END
*/
* Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2013, 2015, Intel Corporation.
+ * Copyright (c) 2013, 2017, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
#ifndef VVP_INTERNAL_H
#define VVP_INTERNAL_H
-#include <lustre/lustre_idl.h>
#include <cl_object.h>
enum obd_notify_event;
* I/O vector information to or from which read/write is going.
*/
struct iov_iter *vui_iter;
-#ifndef HAVE_FILE_OPERATIONS_READ_WRITE_ITER
- /**
- * Total iov count for left IO.
- */
- unsigned long vui_tot_nrsegs;
- /**
- * Old length for iov that was truncated partially.
- */
- size_t vui_iov_olen;
-#endif /* !HAVE_FILE_OPERATIONS_READ_WRITE_ITER */
/**
* Total size for the left IO.
*/
union {
struct vvp_fault_io {
- /**
- * Inode modification time that is checked across DLM
- * lock request.
- */
- time_t ft_mtime;
struct vm_area_struct *ft_vma;
/**
* locked page returned from vvp_io
* check that flags are from filemap_fault
*/
bool ft_flags_valid;
+ struct cl_page_list ft_queue;
} fault;
struct {
struct pipe_inode_info *vui_pipe;
struct {
struct cl_page_list vui_queue;
unsigned long vui_written;
+ unsigned long vui_read;
int vui_from;
int vui_to;
- } write;
+ } readwrite; /* normal io */
} u;
enum vvp_io_subtype vui_io_subtype;
struct kiocb *vui_iocb;
/* Readahead state. */
- pgoff_t vui_ra_start;
- pgoff_t vui_ra_count;
+ pgoff_t vui_ra_start_idx;
+ pgoff_t vui_ra_pages;
/* Set when vui_ra_{start,count} have been initialized. */
- bool vui_ra_valid;
+ bool vui_ra_valid;
};
extern struct lu_device_type vvp_device_type;
extern struct lu_context_key vvp_session_key;
extern struct lu_context_key vvp_thread_key;
-extern struct kmem_cache *vvp_lock_kmem;
extern struct kmem_cache *vvp_object_kmem;
struct vvp_thread_info {
struct cl_lock_descr vti_descr;
struct cl_io vti_io;
struct cl_attr vti_attr;
+ struct cl_sync_io vti_anchor;
};
static inline struct vvp_thread_info *vvp_env_info(const struct lu_env *env)
struct vvp_page {
struct cl_page_slice vpg_cl;
unsigned vpg_defer_uptodate:1,
+ vpg_ra_updated:1,
vpg_ra_used:1;
/** VM page */
struct page *vpg_page;
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 cl_device *vdv_next;
};
-struct vvp_lock {
- struct cl_lock_slice vlk_cl;
-};
-
static inline struct lu_device *vvp2lu_dev(struct vvp_device *vdv)
{
return &vdv->vdv_cl.cd_lu_dev;
static inline struct vvp_device *lu2vvp_dev(const struct lu_device *d)
{
- return container_of0(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)
{
- return container_of0(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)
{
- return container_of0(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)
{
- return container_of0(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)
return cl2vvp_page(slice)->vpg_page;
}
-static inline struct vvp_lock *cl2vvp_lock(const struct cl_lock_slice *slice)
-{
- return container_of(slice, struct vvp_lock, vlk_cl);
-}
-
#ifdef CONFIG_LUSTRE_DEBUG_EXPENSIVE_CHECK
# define CLOBINVRNT(env, clob, expr) \
do { \
if (unlikely(!(expr))) { \
LU_OBJECT_DEBUG(D_ERROR, (env), &(clob)->co_lu, \
- #expr "\n"); \
+ #expr); \
LINVRNT(0); \
} \
} while (0)
int vvp_io_init(const struct lu_env *env, struct cl_object *obj,
struct cl_io *io);
int vvp_io_write_commit(const struct lu_env *env, struct cl_io *io);
-int vvp_lock_init(const struct lu_env *env, struct cl_object *obj,
- struct cl_lock *lock, const struct cl_io *io);
int vvp_page_init(const struct lu_env *env, struct cl_object *obj,
struct cl_page *page, pgoff_t index);
struct lu_object *vvp_object_alloc(const struct lu_env *env,
int vvp_global_init(void);
void vvp_global_fini(void);
+#ifndef HAVE_ACCOUNT_PAGE_DIRTIED_EXPORT
+extern unsigned int (*vvp_account_page_dirtied)(struct page *page,
+ struct address_space *mapping);
+#endif
+
extern const struct file_operations vvp_dump_pgcache_file_ops;
#endif /* VVP_INTERNAL_H */
git://git.whamcloud.com / fs / lustre-release.git / blobdiff