X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fosc%2Fosc_internal.h;h=6890547a207c769f1073f009a101aad4c3945027;hb=d1c8b37cc0b9808251300790ab9c91409fecfb96;hp=b7a51438b555cab681de85b2bbef529241e2efa5;hpb=fbf5870b9848929d352460f1f005b79c0b5ccc5a;p=fs%2Flustre-release.git diff --git a/lustre/osc/osc_internal.h b/lustre/osc/osc_internal.h index b7a5143..6890547 100644 --- a/lustre/osc/osc_internal.h +++ b/lustre/osc/osc_internal.h @@ -1,6 +1,4 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: - * +/* * GPL HEADER START * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -26,8 +24,10 @@ * 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. + * + * Copyright (c) 2011, 2012, Whamcloud, Inc. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -48,6 +48,7 @@ enum async_flags { ASYNC_COUNT_STABLE = 0x4, /* ap_refresh_count will not be called to give the caller a chance to update or cancel the size of the io */ + ASYNC_HP = 0x10, }; struct obd_async_page_ops { @@ -62,9 +63,9 @@ struct osc_async_page { unsigned short oap_cmd; unsigned short oap_interrupted:1; - struct list_head oap_pending_item; - struct list_head oap_urgent_item; - struct list_head oap_rpc_item; + cfs_list_t oap_pending_item; + cfs_list_t oap_urgent_item; + cfs_list_t oap_rpc_item; obd_off oap_obj_off; unsigned oap_page_off; @@ -78,9 +79,9 @@ struct osc_async_page { const struct obd_async_page_ops *oap_caller_ops; void *oap_caller_data; - struct list_head oap_page_list; + cfs_list_t oap_page_list; struct ldlm_lock *oap_ldlm_lock; - spinlock_t oap_lock; + cfs_spinlock_t oap_lock; }; #define oap_page oap_brw_page.pg @@ -88,9 +89,9 @@ struct osc_async_page { #define oap_brw_flags oap_brw_page.flag struct osc_cache_waiter { - struct list_head ocw_entry; + cfs_list_t ocw_entry; cfs_waitq_t ocw_waitq; - struct osc_async_page *ocw_oap; + struct osc_async_page *ocw_oap; int ocw_rc; }; @@ -100,14 +101,21 @@ struct osc_cache_waiter { #define OSCC_FLAG_SYNC_IN_PROGRESS 0x08 /* only allow one thread to sync */ #define OSCC_FLAG_LOW 0x10 #define OSCC_FLAG_EXITING 0x20 +#define OSCC_FLAG_DEGRADED 0x40 +#define OSCC_FLAG_RDONLY 0x80 +#define OSCC_FLAG_NOSPC_BLK 0x100 /* no more block space on OST */ int osc_precreate(struct obd_export *exp); -int osc_create(struct obd_export *exp, struct obdo *oa, - struct lov_stripe_md **ea, struct obd_trans_info *oti); +int osc_create(const struct lu_env *env, struct obd_export *exp, + struct obdo *oa, struct lov_stripe_md **ea, + struct obd_trans_info *oti); +int osc_create_async(struct obd_export *exp, struct obd_info *oinfo, + struct lov_stripe_md **ea, struct obd_trans_info *oti); int osc_real_create(struct obd_export *exp, struct obdo *oa, - struct lov_stripe_md **ea, struct obd_trans_info *oti); + struct lov_stripe_md **ea, struct obd_trans_info *oti); void oscc_init(struct obd_device *obd); void osc_wake_cache_waiters(struct client_obd *cli); +int osc_shrink_grant_to_target(struct client_obd *cli, long target); /* * cl integration. @@ -122,7 +130,7 @@ int osc_enqueue_base(struct obd_export *exp, struct ldlm_res_id *res_id, obd_enqueue_update_f upcall, void *cookie, struct ldlm_enqueue_info *einfo, struct lustre_handle *lockh, - struct ptlrpc_request_set *rqset, int async); + struct ptlrpc_request_set *rqset, int async, int agl); int osc_cancel_base(struct lustre_handle *lockh, __u32 mode); int osc_match_base(struct obd_export *exp, struct ldlm_res_id *res_id, @@ -130,8 +138,11 @@ int osc_match_base(struct obd_export *exp, struct ldlm_res_id *res_id, int *flags, void *data, struct lustre_handle *lockh, int unref); -int osc_punch_base(struct obd_export *exp, struct obdo *oa, - struct obd_capa *capa, +int osc_setattr_async_base(struct obd_export *exp, struct obd_info *oinfo, + struct obd_trans_info *oti, + obd_enqueue_update_f upcall, void *cookie, + struct ptlrpc_request_set *rqset); +int osc_punch_base(struct obd_export *exp, struct obd_info *oinfo, obd_enqueue_update_f upcall, void *cookie, struct ptlrpc_request_set *rqset); @@ -144,15 +155,12 @@ void osc_oap_to_pending(struct osc_async_page *oap); int osc_oap_interrupted(const struct lu_env *env, struct osc_async_page *oap); void loi_list_maint(struct client_obd *cli, struct lov_oinfo *loi); void osc_check_rpcs(const struct lu_env *env, struct client_obd *cli); - -int osc_queue_async_io(const struct lu_env *env, - struct obd_export *exp, struct lov_stripe_md *lsm, - struct lov_oinfo *loi, void *cookie, - int cmd, obd_off off, int count, - obd_flag brw_flags, enum async_flags async_flags); -int osc_teardown_async_page(struct obd_export *exp, - struct lov_stripe_md *lsm, - struct lov_oinfo *loi, void *cookie); +int osc_queue_async_io(const struct lu_env *env, struct obd_export *exp, + struct lov_stripe_md *lsm, struct lov_oinfo *loi, + struct osc_async_page *oap, int cmd, int off, + int count, obd_flag brw_flags, enum async_flags async_flags); +int osc_teardown_async_page(struct obd_export *exp, struct lov_stripe_md *lsm, + struct lov_oinfo *loi, struct osc_async_page *oap); int osc_process_config_base(struct obd_device *obd, struct lustre_cfg *cfg); int osc_set_async_flags_base(struct client_obd *cli, struct lov_oinfo *loi, struct osc_async_page *oap, @@ -162,7 +170,7 @@ int osc_enter_cache_try(const struct lu_env *env, struct osc_async_page *oap, int transient); struct cl_page *osc_oap2cl_page(struct osc_async_page *oap); -extern spinlock_t osc_ast_guard; +extern cfs_spinlock_t osc_ast_guard; int osc_cleanup(struct obd_device *obd); int osc_setup(struct obd_device *obd, struct lustre_cfg *lcfg); @@ -182,14 +190,8 @@ extern struct lu_device_type osc_device_type; static inline int osc_recoverable_error(int rc) { - return (rc == -EIO || rc == -EROFS || rc == -ENOMEM || rc == -EAGAIN); -} - -/* return 1 if osc should be resend request */ -static inline int osc_should_resend(int resend, struct client_obd *cli) -{ - return atomic_read(&cli->cl_resends) ? - atomic_read(&cli->cl_resends) > resend : 1; + return (rc == -EIO || rc == -EROFS || rc == -ENOMEM || + rc == -EAGAIN || rc == -EINPROGRESS); } #ifndef min_t @@ -218,5 +220,21 @@ static inline struct osc_device *obd2osc_dev(const struct obd_device *d) return container_of0(d->obd_lu_dev, struct osc_device, od_cl.cd_lu_dev); } - +int osc_dlm_lock_pageref(struct ldlm_lock *dlm); + +int osc_quota_init(void); +int osc_quota_exit(void); +int osc_quota_cleanup(struct obd_device *obd); +int osc_quota_setdq(struct client_obd *cli, const unsigned int qid[], + obd_flag valid, obd_flag flags); +int osc_quota_chkdq(struct client_obd *cli, const unsigned int qid[]); +int osc_quotactl(struct obd_device *unused, struct obd_export *exp, + struct obd_quotactl *oqctl); +int osc_quotacheck(struct obd_device *unused, struct obd_export *exp, + struct obd_quotactl *oqctl); +int osc_quota_poll_check(struct obd_export *exp, struct if_quotacheck *qchk); +int osc_quota_adjust_qunit(struct obd_export *exp, + struct quota_adjust_qunit *oqaq, + struct lustre_quota_ctxt *qctxt, + struct ptlrpc_request_set *rqset); #endif /* OSC_INTERNAL_H */