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-807 utils: remove old service tags support
[fs/lustre-release.git]
/
lustre
/
include
/
lclient.h
diff --git
a/lustre/include/lclient.h
b/lustre/include/lclient.h
index
4df7c2b
..
68b49e1
100644
(file)
--- a/
lustre/include/lclient.h
+++ b/
lustre/include/lclient.h
@@
-26,8
+26,10
@@
* GPL HEADER END
*/
/*
* GPL HEADER END
*/
/*
- * Copyright
2008 Sun Microsystems, Inc.
All rights reserved.
+ * Copyright
(c) 2008, 2010, Oracle and/or its affiliates.
All rights reserved.
* Use is subject to license terms.
* Use is subject to license terms.
+ *
+ * Copyright (c) 2011 Whamcloud, Inc.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
*/
/*
* This file is part of Lustre, http://www.lustre.org/
@@
-43,36
+45,35
@@
#ifndef LCLIENT_H
#define LCLIENT_H
#ifndef LCLIENT_H
#define LCLIENT_H
-int cl_glimpse_size(struct inode *inode);
+blkcnt_t dirty_cnt(struct inode *inode);
+
+int cl_glimpse_size0(struct inode *inode, int agl);
int cl_glimpse_lock(const struct lu_env *env, struct cl_io *io,
int cl_glimpse_lock(const struct lu_env *env, struct cl_io *io,
- struct inode *inode, struct cl_object *clob);
+ struct inode *inode, struct cl_object *clob
, int agl
);
-/**
- * Common IO arguments for various VFS I/O interfaces.
- */
-struct ccc_io_args {
- int cia_is_sendfile;
-#ifndef HAVE_FILE_WRITEV
- struct kiocb *cia_iocb;
-#endif
- struct iovec *cia_iov;
- unsigned long cia_nrsegs;
- read_actor_t cia_actor;
- void *cia_target;
-};
+static inline int cl_glimpse_size(struct inode *inode)
+{
+ return cl_glimpse_size0(inode, 0);
+}
+
+static inline int cl_agl(struct inode *inode)
+{
+ return cl_glimpse_size0(inode, 1);
+}
/**
/**
- * Locking policy for
truncate
.
+ * Locking policy for
setattr
.
*/
*/
-enum ccc_
trunc
_lock_type {
+enum ccc_
setattr
_lock_type {
/** Locking is done by server */
/** Locking is done by server */
-
TRUNC
_NOLOCK,
+
SETATTR
_NOLOCK,
/** Extent lock is enqueued */
/** Extent lock is enqueued */
-
TRUNC_EXTENT
,
+
SETATTR_EXTENT_LOCK
,
/** Existing local extent lock is used */
/** Existing local extent lock is used */
- TRUNC_MATCH
+ SETATTR_MATCH_LOCK
};
};
+
/**
* IO state private to vvp or slp layers.
*/
/**
* IO state private to vvp or slp layers.
*/
@@
-100,9
+101,9
@@
struct ccc_io {
union {
struct {
union {
struct {
- int cui_locks_released;
- enum ccc_
trunc
_lock_type cui_local_lock;
- }
trunc
;
+ int
cui_locks_released;
+ enum ccc_
setattr
_lock_type cui_local_lock;
+ }
setattr
;
} u;
/**
* True iff io is processing glimpse right now.
} u;
/**
* True iff io is processing glimpse right now.
@@
-117,6
+118,12
@@
struct ccc_io {
#endif
};
#endif
};
+/**
+ * True, if \a io is a normal io, False for other (sendfile, splice*).
+ * must be impementated in arch specific code.
+ */
+int cl_is_normalio(const struct lu_env *env, const struct cl_io *io);
+
extern struct lu_context_key ccc_key;
extern struct lu_context_key ccc_session_key;
extern struct lu_context_key ccc_key;
extern struct lu_context_key ccc_session_key;
@@
-142,6
+149,13
@@
static inline struct cl_attr *ccc_env_thread_attr(const struct lu_env *env)
return attr;
}
return attr;
}
+static inline struct cl_io *ccc_env_thread_io(const struct lu_env *env)
+{
+ struct cl_io *io = &ccc_env_info(env)->cti_io;
+ memset(io, 0, sizeof(*io));
+ return io;
+}
+
struct ccc_session {
struct ccc_io cs_ios;
};
struct ccc_session {
struct ccc_io cs_ios;
};
@@
-174,7
+188,7
@@
struct ccc_object {
*
* \see ccc_page::cpg_pending_linkage
*/
*
* \see ccc_page::cpg_pending_linkage
*/
-
struct list_head
cob_pending_list;
+
cfs_list_t
cob_pending_list;
/**
* Access this counter is protected by inode->i_sem. Now that
/**
* Access this counter is protected by inode->i_sem. Now that
@@
-187,7
+201,7
@@
struct ccc_object {
*
* \see ll_vm_open(), ll_vm_close().
*/
*
* \see ll_vm_open(), ll_vm_close().
*/
-
atomic_t
cob_mmap_cnt;
+
cfs_atomic_t
cob_mmap_cnt;
};
/**
};
/**
@@
-205,18
+219,9
@@
struct ccc_page {
* that is, never iterated through, only checked for list_empty(), but
* having a list is useful for debugging.
*/
* that is, never iterated through, only checked for list_empty(), but
* having a list is useful for debugging.
*/
-
struct list_head
cpg_pending_linkage;
+
cfs_list_t
cpg_pending_linkage;
/** VM page */
cfs_page_t *cpg_page;
/** VM page */
cfs_page_t *cpg_page;
- /**
- * checksum for paranoid I/O debugging enabled by
- * ENABLE_LLITE_CHECKSUM configuration option.
- *
- * XXX This cannot be implemented reliably because checksum cannot be
- * updated from ->set_page_dirty() that is called without page VM
- * lock.
- */
- __u32 cpg_checksum;
};
static inline struct ccc_page *cl2ccc_page(const struct cl_page_slice *slice)
};
static inline struct ccc_page *cl2ccc_page(const struct cl_page_slice *slice)
@@
-338,8
+343,7
@@
void ccc_io_advance(const struct lu_env *env, const struct cl_io_slice *ios,
void ccc_io_update_iov(const struct lu_env *env, struct ccc_io *cio,
struct cl_io *io);
int ccc_prep_size(const struct lu_env *env, struct cl_object *obj,
void ccc_io_update_iov(const struct lu_env *env, struct ccc_io *cio,
struct cl_io *io);
int ccc_prep_size(const struct lu_env *env, struct cl_object *obj,
- struct cl_io *io, loff_t start, size_t count, int vfslock,
- int *exceed);
+ struct cl_io *io, loff_t start, size_t count, int *exceed);
void ccc_req_completion(const struct lu_env *env,
const struct cl_req_slice *slice, int ioret);
void ccc_req_attr_set(const struct lu_env *env,const struct cl_req_slice *slice,
void ccc_req_completion(const struct lu_env *env,
const struct cl_req_slice *slice, int ioret);
void ccc_req_attr_set(const struct lu_env *env,const struct cl_req_slice *slice,
@@
-360,17
+364,18
@@
cfs_page_t *cl2vm_page (const struct cl_page_slice *slice);
struct inode *ccc_object_inode(const struct cl_object *obj);
struct ccc_object *cl_inode2ccc (struct inode *inode);
struct inode *ccc_object_inode(const struct cl_object *obj);
struct ccc_object *cl_inode2ccc (struct inode *inode);
-int cl_setattr_do_truncate(struct inode *inode, loff_t size,
- struct obd_capa *capa);
-int cl_setattr_ost(struct inode *inode, struct obd_capa *capa);
+int cl_setattr_ost(struct inode *inode, const struct iattr *attr,
+ struct obd_capa *capa);
struct cl_page *ccc_vmpage_page_transient(cfs_page_t *vmpage);
int ccc_object_invariant(const struct cl_object *obj);
struct cl_page *ccc_vmpage_page_transient(cfs_page_t *vmpage);
int ccc_object_invariant(const struct cl_object *obj);
-int cl_inode_init(struct inode *inode, struct lustre_md *md);
+int cl_
file_
inode_init(struct inode *inode, struct lustre_md *md);
void cl_inode_fini(struct inode *inode);
int cl_local_size(struct inode *inode);
__u16 ll_dirent_type_get(struct lu_dirent *ent);
void cl_inode_fini(struct inode *inode);
int cl_local_size(struct inode *inode);
__u16 ll_dirent_type_get(struct lu_dirent *ent);
+__u64 cl_fid_build_ino(const struct lu_fid *fid, int api32);
+__u32 cl_fid_build_gen(const struct lu_fid *fid);
#ifdef INVARIANT_CHECK
# define CLOBINVRNT(env, clob, expr) \
#ifdef INVARIANT_CHECK
# define CLOBINVRNT(env, clob, expr) \
@@
-392,6
+397,7
@@
int cl_ocd_update(struct obd_device *host,
struct ccc_grouplock {
struct lu_env *cg_env;
struct ccc_grouplock {
struct lu_env *cg_env;
+ struct cl_io *cg_io;
struct cl_lock *cg_lock;
unsigned long cg_gid;
};
struct cl_lock *cg_lock;
unsigned long cg_gid;
};