X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fosc%2Fosc_internal.h;h=9b11a9dbb65802d9702e15605e6f01d9a4d04bc4;hb=9f3f665577797660984bc1b6cbd443111dceef49;hp=b30fc9b1bac3ef744230e6ed4dabad2f13d0ed60;hpb=8cad1d968ad4efee46d08aee1e6a6266d4713e84;p=fs%2Flustre-release.git

diff --git a/lustre/osc/osc_internal.h b/lustre/osc/osc_internal.h
index b30fc9b..9b11a9d 100644
--- a/lustre/osc/osc_internal.h
+++ b/lustre/osc/osc_internal.h
@@ -30,6 +30,9 @@
  * Use is subject to license terms.
  */
 /*
+ * Copyright (c) 2011 Whamcloud, Inc.
+ */
+/*
  * This file is part of Lustre, http://www.lustre.org/
  * Lustre is a trademark of Sun Microsystems, Inc.
  */
@@ -49,7 +52,6 @@ enum async_flags {
                                      to give the caller a chance to update
                                      or cancel the size of the io */
         ASYNC_HP = 0x10,
-        ASYNC_SYNCFS = 0x20,
 };
 
 struct obd_async_page_ops {
@@ -104,6 +106,7 @@ struct osc_cache_waiter {
 #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,
@@ -155,14 +158,12 @@ 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,
@@ -195,13 +196,6 @@ 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 cfs_atomic_read(&cli->cl_resends) ?
-               cfs_atomic_read(&cli->cl_resends) > resend : 1;
-}
-
 #ifndef min_t
 #define min_t(type,x,y) \
         ({ type __x = (x); type __y = (y); __x < __y ? __x: __y; })