X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fobdfilter%2Ffilter_internal.h;h=d8cf3f9e0b7dacde66d0d64215c628787f739f91;hb=491a448008d8f8a4dc61789c14bd96de205f856e;hp=e5db720187eeaa933845df4d0e4d61d616ad79d8;hpb=cefa8cda2ba2d288ccaa4ec077a6c627592503ea;p=fs%2Flustre-release.git diff --git a/lustre/obdfilter/filter_internal.h b/lustre/obdfilter/filter_internal.h index e5db720..d8cf3f9 100644 --- a/lustre/obdfilter/filter_internal.h +++ b/lustre/obdfilter/filter_internal.h @@ -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. */ /* @@ -40,10 +40,10 @@ #ifdef __KERNEL__ # include #endif -#include #include #include #include +#include #include #define FILTER_LAYOUT_VERSION "2" @@ -59,6 +59,7 @@ OBD_INCOMPAT_COMMON_LR) #define FILTER_GRANT_CHUNK (2ULL * PTLRPC_MAX_BRW_SIZE) +#define FILTER_GRANT_SHRINK_LIMIT (16ULL * FILTER_GRANT_CHUNK) #define GRANT_FOR_LLOG(obd) 16 extern struct file_operations filter_per_export_stats_fops; @@ -69,20 +70,15 @@ extern struct file_operations filter_per_nid_stats_fops; OBD_MD_FLSIZE | OBD_MD_FLBLOCKS | OBD_MD_FLBLKSZ|\ OBD_MD_FLATIME | OBD_MD_FLMTIME | OBD_MD_FLCTIME) -struct filter_fid { - struct ll_fid ff_fid; /* ff_fid.f_type == file stripe number */ - __u64 ff_objid; - __u64 ff_group; -}; - /* per-client-per-object persistent state (LRU) */ struct filter_mod_data { - struct list_head fmd_list; /* linked to fed_mod_list */ - __u64 fmd_id; /* object being written to */ - __u64 fmd_gr; /* group being written to */ - __u64 fmd_mactime_xid;/* xid highest {m,a,c}time setattr */ - unsigned long fmd_expire; /* jiffies when it should expire */ - int fmd_refcount; /* reference counter - list holds 1 */ + cfs_list_t fmd_list; /* linked to fed_mod_list */ + __u64 fmd_id; /* object being written to */ + __u64 fmd_gr; /* group being written to */ + __u64 fmd_mactime_xid;/* xid highest {m,a,c}time + * setattr */ + unsigned long fmd_expire; /* jiffies when it should expire */ + int fmd_refcount; /* reference counter, list holds 1 */ }; #ifdef HAVE_BGL_SUPPORT @@ -91,7 +87,7 @@ struct filter_mod_data { #define FILTER_FMD_MAX_NUM_DEFAULT 32 #endif /* Client cache seconds */ -#define FILTER_FMD_MAX_AGE_DEFAULT ((obd_timeout + 10) * HZ) +#define FILTER_FMD_MAX_AGE_DEFAULT ((obd_timeout + 10) * CFS_HZ) #ifndef HAVE_PAGE_CONSTANT #define mapping_cap_page_constant_write(mapping) 0 @@ -100,9 +96,9 @@ struct filter_mod_data { #endif struct filter_mod_data *filter_fmd_find(struct obd_export *exp, - obd_id objid, obd_gr group); + obd_id objid, obd_seq seq); struct filter_mod_data *filter_fmd_get(struct obd_export *exp, - obd_id objid, obd_gr group); + obd_id objid, obd_seq seq); void filter_fmd_put(struct obd_export *exp, struct filter_mod_data *fmd); void filter_fmd_expire(struct obd_export *exp); @@ -117,8 +113,7 @@ enum { LPROC_FILTER_LAST, }; -//#define FILTER_MAX_CACHE_SIZE (32 * 1024 * 1024) /* was OBD_OBJECT_EOF */ -#define FILTER_MAX_CACHE_SIZE OBD_OBJECT_EOF +#define FILTER_MAX_CACHE_SIZE (8 * 1024 * 1024) /* We have to pass a 'created' array to fsfilt_map_inode_pages() which we * then ignore. So we pre-allocate one that everyone can use... */ @@ -126,26 +121,26 @@ enum { extern int *obdfilter_created_scratchpad; extern void target_recovery_fini(struct obd_device *obd); -extern void target_recovery_init(struct obd_device *obd, +extern void target_recovery_init(struct lu_target *lut, svc_handler_t handler); /* filter.c */ void f_dput(struct dentry *); struct dentry *filter_fid2dentry(struct obd_device *, struct dentry *dir, - obd_gr group, obd_id id); -struct dentry *__filter_oa2dentry(struct obd_device *obd, struct obdo *oa, + obd_seq seq, obd_id id); +struct dentry *__filter_oa2dentry(struct obd_device *obd, struct ost_id *ostid, const char *what, int quiet); -#define filter_oa2dentry(obd, oa) __filter_oa2dentry(obd, oa, __FUNCTION__, 0) +#define filter_oa2dentry(obd, ostid) __filter_oa2dentry(obd, ostid, \ + __func__, 0) -int filter_finish_transno(struct obd_export *, struct obd_trans_info *, int rc, - int force_sync); +int filter_finish_transno(struct obd_export *, struct inode *, + struct obd_trans_info *, int rc, int force_sync); __u64 filter_next_id(struct filter_obd *, struct obdo *); -__u64 filter_last_id(struct filter_obd *, obd_gr group); +__u64 filter_last_id(struct filter_obd *, obd_seq seq); int filter_update_fidea(struct obd_export *exp, struct inode *inode, void *handle, struct obdo *oa); -int filter_update_server_data(struct obd_device *, struct file *, - struct lr_server_data *, int force_sync); -int filter_update_last_objid(struct obd_device *, obd_gr, int force_sync); +int filter_update_server_data(struct obd_device *); +int filter_update_last_objid(struct obd_device *, obd_seq, int force_sync); int filter_common_setup(struct obd_device *, struct lustre_cfg *lcfg, void *option); int filter_destroy(struct obd_export *exp, struct obdo *oa, @@ -156,9 +151,10 @@ int filter_setattr_internal(struct obd_export *exp, struct dentry *dentry, int filter_setattr(struct obd_export *exp, struct obd_info *oinfo, struct obd_trans_info *oti); -struct dentry *filter_create_object(struct obd_device *obd, struct obdo *oa); +int filter_create(struct obd_export *exp, struct obdo *oa, + struct lov_stripe_md **ea, struct obd_trans_info *oti); -struct obd_llog_group *filter_find_olg(struct obd_device *obd, int group); +struct obd_llog_group *filter_find_olg(struct obd_device *obd, int seq); /* filter_lvb.c */ extern struct ldlm_valblock_ops filter_lvbo; @@ -174,8 +170,8 @@ int filter_commitrw(int cmd, struct obd_export *, struct obdo *, int objcount, struct niobuf_local *, struct obd_trans_info *, int rc); int filter_brw(int cmd, struct obd_export *, struct obd_info *oinfo, obd_count oa_bufs, struct brw_page *pga, struct obd_trans_info *); -void filter_invalidate_cache(struct obd_device *, struct obd_ioobj *, - struct niobuf_remote *, struct inode *); +void filter_release_cache(struct obd_device *, struct obd_ioobj *, + struct niobuf_remote *, struct inode *); /* filter_io_*.c */ struct filter_iobuf; @@ -185,9 +181,10 @@ int filter_commitrw_write(struct obd_export *exp, struct obdo *oa, int objcount, int rc); obd_size filter_grant_space_left(struct obd_export *exp); long filter_grant(struct obd_export *exp, obd_size current_grant, - obd_size want, obd_size fs_space_left); + obd_size want, obd_size fs_space_left, int conservative); void filter_grant_commit(struct obd_export *exp, int niocount, struct niobuf_local *res); +void filter_grant_incoming(struct obd_export *exp, struct obdo *oa); struct filter_iobuf *filter_alloc_iobuf(struct filter_obd *, int rw, int num_pages); void filter_free_iobuf(struct filter_iobuf *iobuf); @@ -235,16 +232,10 @@ static void lprocfs_filter_init_vars(struct lprocfs_static_vars *lvars) /* Quota stuff */ extern quota_interface_t *filter_quota_interface_ref; -/* Capability */ -static inline __u64 obdo_mdsno(struct obdo *oa) -{ - return oa->o_gr - FILTER_GROUP_MDS0; -} - int filter_update_capa_key(struct obd_device *obd, struct lustre_capa_key *key); -int filter_auth_capa(struct obd_export *exp, struct lu_fid *fid, __u64 mdsid, +int filter_auth_capa(struct obd_export *exp, struct lu_fid *fid, obd_seq seq, struct lustre_capa *capa, __u64 opc); -int filter_capa_fixoa(struct obd_export *exp, struct obdo *oa, __u64 mdsid, +int filter_capa_fixoa(struct obd_export *exp, struct obdo *oa, obd_seq seq, struct lustre_capa *capa); void filter_free_capa_keys(struct filter_obd *filter); @@ -252,4 +243,15 @@ void blacklist_add(uid_t uid); void blacklist_del(uid_t uid); int blacklist_display(char *buf, int bufsize); +/* sync on lock cancel is useless when we force a journal flush, + * and if we enable async journal commit, we should also turn on + * sync on lock cancel if it is not enabled already. */ +static inline void filter_slc_set(struct filter_obd *filter) +{ + if (filter->fo_syncjournal == 1) + filter->fo_sync_lock_cancel = NEVER_SYNC_ON_CANCEL; + else if (filter->fo_sync_lock_cancel == NEVER_SYNC_ON_CANCEL) + filter->fo_sync_lock_cancel = ALWAYS_SYNC_ON_CANCEL; +} + #endif /* _FILTER_INTERNAL_H */