X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fliblustre%2Fllite_lib.h;h=ea15572b8787f3e92b5668f1ecce100a19bda68a;hb=3e4061862e751dbbbbba273403b56201e705a830;hp=e02faf20caa2e2b79fb102e1c2933e3869c94df8;hpb=70e80ade90af09300396706b8910e196a7928520;p=fs%2Flustre-release.git diff --git a/lustre/liblustre/llite_lib.h b/lustre/liblustre/llite_lib.h index e02faf2..ea15572 100644 --- a/lustre/liblustre/llite_lib.h +++ b/lustre/liblustre/llite_lib.h @@ -16,8 +16,8 @@ * in the LICENSE file that accompanied this code). * * You should have received a copy of the GNU General Public License - * version 2 along with this program; If not, see [sun.com URL with a - * copy of GPLv2]. + * 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 @@ -26,7 +26,7 @@ * GPL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. */ /* @@ -36,6 +36,18 @@ #ifndef __LLU_H_ #define __LLU_H_ +#include +#include +#include +#ifdef HAVE_XTIO_H +#include +#endif +#include +#include +#include +#ifdef HAVE_FILE_H +#include +#endif #include #include @@ -47,15 +59,17 @@ #include #include -/* This should not be "optimized" use ~0ULL because page->index is a long and +/* for struct cl_lock_descr and struct cl_io */ +#include +#include + +/* This should not be "optimized" use ~0ULL because page->index is a long and * 32-bit systems are therefore limited to 16TB in a mapping */ #define PAGE_CACHE_MAXBYTES ((__u64)(~0UL) << CFS_PAGE_SHIFT) - struct ll_file_data { struct obd_client_handle fd_mds_och; __u32 fd_flags; - struct lustre_handle fd_cwlockh; - unsigned long fd_gid; + struct ccc_grouplock fd_grouplock; }; struct llu_sb_info { @@ -65,11 +79,13 @@ struct llu_sb_info { struct lu_fid ll_root_fid; int ll_flags; struct lustre_client_ocd ll_lco; - struct list_head ll_conn_chain; + cfs_list_t ll_conn_chain; struct obd_uuid ll_mds_uuid; struct obd_uuid ll_mds_peer_uuid; char *ll_instance; + struct lu_site *ll_site; + struct cl_device *ll_cl; }; #define LL_SBI_NOLCK 0x1 @@ -85,7 +101,7 @@ struct llu_inode_info { struct lov_stripe_md *lli_smd; char *lli_symlink_name; - struct semaphore lli_open_sem; + cfs_semaphore_t lli_open_sem; __u64 lli_maxbytes; unsigned long lli_flags; __u64 lli_ioepoch; @@ -109,6 +125,9 @@ struct llu_inode_info { /* not for stat, change it later */ int lli_st_flags; unsigned long lli_st_generation; + struct cl_object *lli_clob; + /* the most recent timestamps obtained from mds */ + struct ost_lvb lli_lvb; }; static inline struct llu_sb_info *llu_fs2sbi(struct filesys *fs) @@ -121,11 +140,18 @@ static inline struct llu_inode_info *llu_i2info(struct inode *inode) return (struct llu_inode_info*)(inode->i_private); } +static inline int ll_inode_flags(struct inode *inode) +{ + return llu_i2info(inode)->lli_st_flags; +} + static inline struct intnl_stat *llu_i2stat(struct inode *inode) { return &inode->i_stbuf; } +#define ll_inode_blksize(inode) (llu_i2stat(inode)->st_blksize) + static inline struct llu_sb_info *llu_i2sbi(struct inode *inode) { return llu_i2info(inode)->lli_sbi; @@ -218,16 +244,16 @@ int ll_parse_mount_target(const char *target, char **mgsnid, extern struct mount_option_s mount_option; /* super.c */ -void llu_update_inode(struct inode *inode, struct mdt_body *body, - struct lov_stripe_md *lmm); +void llu_update_inode(struct inode *inode, struct lustre_md *md); void obdo_to_inode(struct inode *dst, struct obdo *src, obd_flag valid); -void obdo_from_inode(struct obdo *dst, struct inode *src, obd_flag valid); int ll_it_open_error(int phase, struct lookup_intent *it); struct inode *llu_iget(struct filesys *fs, struct lustre_md *md); -int llu_inode_getattr(struct inode *inode, struct obdo *obdo); +int llu_inode_getattr(struct inode *inode, struct obdo *obdo, + __u64 ioepoch, int sync); int llu_md_setattr(struct inode *inode, struct md_op_data *op_data, struct md_open_data **mod); int llu_setattr_raw(struct inode *inode, struct iattr *attr); +int llu_put_grouplock(struct inode *inode, unsigned long arg); extern struct fssw_ops llu_fssw_ops; @@ -239,25 +265,24 @@ void llu_finish_md_op_data(struct md_op_data *op_data); int llu_create(struct inode *dir, struct pnode_base *pnode, int mode); int llu_local_open(struct llu_inode_info *lli, struct lookup_intent *it); int llu_iop_open(struct pnode *pnode, int flags, mode_t mode); +void llu_done_writing_attr(struct inode *inode, struct md_op_data *op_data); int llu_md_close(struct obd_export *md_exp, struct inode *inode); +void llu_pack_inode2opdata(struct inode *inode, struct md_op_data *op_data, + struct lustre_handle *fh); int llu_file_release(struct inode *inode); -int llu_sizeonmds_update(struct inode *inode, struct md_open_data *mod, - struct lustre_handle *fh, __u64 ioepoch); +int llu_som_update(struct inode *inode, struct md_op_data *op_data); int llu_iop_close(struct inode *inode); _SYSIO_OFF_T llu_iop_pos(struct inode *ino, _SYSIO_OFF_T off); int llu_vmtruncate(struct inode * inode, loff_t offset, obd_flag obd_flags); void obdo_refresh_inode(struct inode *dst, struct obdo *src, obd_flag valid); int llu_objects_destroy(struct ptlrpc_request *request, struct inode *dir); +void llu_ioepoch_open(struct llu_inode_info *lli, __u64 ioepoch); /* rw.c */ int llu_iop_read(struct inode *ino, struct ioctx *ioctxp); int llu_iop_write(struct inode *ino, struct ioctx *ioctxp); int llu_iop_iodone(struct ioctx *ioctxp); -int llu_local_size(struct inode *inode); int llu_glimpse_size(struct inode *inode); -int llu_extent_lock_cancel_cb(struct ldlm_lock *lock, - struct ldlm_lock_desc *new, void *data, - int flag); int llu_extent_lock(struct ll_file_data *fd, struct inode *inode, struct lov_stripe_md *lsm, int mode, ldlm_policy_data_t *policy, struct lustre_handle *lockh, @@ -278,11 +303,11 @@ int llu_md_blocking_ast(struct ldlm_lock *lock, void *data, int flag); /* dir.c */ -ssize_t llu_iop_filldirentries(struct inode *ino, _SYSIO_OFF_T *basep, +ssize_t llu_iop_filldirentries(struct inode *ino, _SYSIO_OFF_T *basep, char *buf, size_t nbytes); /* liblustre/llite_fid.c*/ -unsigned long llu_fid_build_ino(struct llu_sb_info *sbi, +unsigned long llu_fid_build_ino(struct llu_sb_info *sbi, struct lu_fid *fid); /* ext2 related */ @@ -306,6 +331,8 @@ static inline struct ext2_dirent *ext2_next_entry(struct ext2_dirent *p) return (struct ext2_dirent*)((char*) p + le16_to_cpu(p->rec_len)); } +int llu_merge_lvb(struct inode *inode); + static inline void inode_init_lvb(struct inode *inode, struct ost_lvb *lvb) { struct intnl_stat *st = llu_i2stat(inode); @@ -316,4 +343,94 @@ static inline void inode_init_lvb(struct inode *inode, struct ost_lvb *lvb) lvb->lvb_ctime = st->st_ctime; } +#define LLU_IO_GROUP_SIZE(x) \ + (sizeof(struct llu_io_group) + \ + (sizeof(struct ll_async_page) + \ + sizeof(cfs_page_t) + \ + llap_cookie_size) * (x)) + +struct llu_io_session { + struct inode *lis_inode; + int lis_cmd; + int lis_max_groups; + int lis_ngroups; + int lis_rc; + __u64 lis_rwcount; +}; + +struct llu_io_group +{ + struct lustre_rw_params *lig_params; + int lig_rc; + __u64 lig_rwcount; +}; + +struct llu_io_session; +void put_io_group(struct llu_io_group *group); + +int cl_sb_init(struct llu_sb_info *sbi); +int cl_sb_fini(struct llu_sb_info *sbi); +int cl_inode_init(struct inode *inode, struct lustre_md *md); +void cl_inode_fini(struct inode *inode); + +void llu_io_init(struct cl_io *io, struct inode *inode, int write); + +struct slp_io { + struct llu_io_session *sio_session; +}; + +struct slp_session { + struct slp_io ss_ios; +}; + +static inline struct slp_session *slp_env_session(const struct lu_env *env) +{ + extern struct lu_context_key slp_session_key; + struct slp_session *ses; + ses = lu_context_key_get(env->le_ses, &slp_session_key); + LASSERT(ses != NULL); + return ses; +} +static inline struct slp_io *slp_env_io(const struct lu_env *env) +{ + return &slp_env_session(env)->ss_ios; +} + +/* lclient compat stuff */ +#define cl_inode_info llu_inode_info +#define cl_i2info(info) llu_i2info(info) +#define cl_inode_mode(inode) (llu_i2stat(inode)->st_mode) +#define cl_i2sbi llu_i2sbi +#define cl_isize_read(inode) (llu_i2stat(inode)->st_size) +#define cl_isize_write(inode,kms) do{llu_i2stat(inode)->st_size = kms;}while(0) +#define cl_isize_write_nolock(inode,kms) cl_isize_write(inode,kms) + +static inline void cl_isize_lock(struct inode *inode, int lsmlock) +{ +} + +static inline void cl_isize_unlock(struct inode *inode, int lsmlock) +{ +} + +static inline int cl_merge_lvb(struct inode *inode) +{ + return llu_merge_lvb(inode); +} + +#define cl_inode_atime(inode) (llu_i2stat(inode)->st_atime) +#define cl_inode_ctime(inode) (llu_i2stat(inode)->st_ctime) +#define cl_inode_mtime(inode) (llu_i2stat(inode)->st_mtime) + +static inline struct obd_capa *cl_capa_lookup(struct inode *inode, + enum cl_req_type crt) +{ + return NULL; +} + +static inline void cl_stats_tally(struct cl_device *dev, enum cl_req_type crt, + int rc) +{ +} + #endif