Whamcloud - gitweb
LU-80 lov: large stripe count support
[fs/lustre-release.git] / lustre / include / obd.h
index e671e69..e670dba 100644 (file)
@@ -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.
  */
@@ -129,11 +132,13 @@ struct lov_stripe_md {
         cfs_spinlock_t   lsm_lock;
         pid_t            lsm_lock_owner; /* debugging */
 
+        /* maximum possible file size, might change as OSTs status changes,
+         * e.g. disconnected, deactivated */
+        __u64            lsm_maxbytes;
         struct {
                 /* Public members. */
                 __u64 lw_object_id;        /* lov object id */
                 __u64 lw_object_seq;       /* lov object seq */
-                __u64 lw_maxbytes;         /* maximum possible file size */
 
                 /* LOV-private members start here -- only for use in lov/. */
                 __u32 lw_magic;
@@ -148,7 +153,6 @@ struct lov_stripe_md {
 
 #define lsm_object_id    lsm_wire.lw_object_id
 #define lsm_object_seq   lsm_wire.lw_object_seq
-#define lsm_maxbytes     lsm_wire.lw_maxbytes
 #define lsm_magic        lsm_wire.lw_magic
 #define lsm_stripe_size  lsm_wire.lw_stripe_size
 #define lsm_pattern      lsm_wire.lw_pattern
@@ -169,6 +173,7 @@ struct obd_info {
            - while lock handling, the flags obtained on the enqueue
            request are set here.
            - while stats, the flags used for control delay/resend.
+           - while setattr, the flags used for distinguish punch operation
          */
         int                     oi_flags;
         /* Lock handle specific for every OSC lock. */
@@ -225,10 +230,15 @@ struct brw_page {
 
 struct ost_server_data;
 
+struct osd_properties {
+        size_t osd_max_ea_size;
+};
+
 #define OBT_MAGIC       0xBDDECEAE
 /* hold common fields for "target" device */
 struct obd_device_target {
         __u32                     obt_magic;
+        __u32                     obt_instance;
         struct super_block       *obt_sb;
         /** last_rcvd file */
         struct file              *obt_rcvd_filp;
@@ -240,6 +250,7 @@ struct obd_device_target {
         cfs_rw_semaphore_t        obt_rwsem;
         struct vfsmount          *obt_vfsmnt;
         struct file              *obt_health_check_filp;
+        struct osd_properties    obt_osd_properties;
 };
 
 /* llog contexts */
@@ -301,7 +312,7 @@ struct filter_obd {
 
         obd_size             fo_readcache_max_filesize;
         cfs_spinlock_t       fo_flags_lock;
-        int                  fo_read_cache:1,   /**< enable read-only cache */
+        unsigned int         fo_read_cache:1,   /**< enable read-only cache */
                              fo_writethrough_cache:1,/**< read cache writes */
                              fo_mds_ost_sync:1, /**< MDS-OST orphan recovery*/
                              fo_raid_degraded:1;/**< RAID device degraded */
@@ -459,7 +470,6 @@ struct client_obd {
         cfs_waitq_t              cl_destroy_waitq;
 
         struct mdc_rpc_lock     *cl_rpc_lock;
-        struct mdc_rpc_lock     *cl_setattr_lock;
         struct mdc_rpc_lock     *cl_close_lock;
         struct osc_creator       cl_oscc;
 
@@ -501,6 +511,7 @@ struct mgs_obd {
         cfs_list_t                       mgs_fs_db_list;
         cfs_semaphore_t                  mgs_sem;
         cfs_proc_dir_entry_t            *mgs_proc_live;
+        cfs_time_t                       mgs_start_time;
 };
 
 struct mds_obd {
@@ -577,11 +588,12 @@ struct obd_id_info {
 /* */
 
 struct echo_obd {
-        struct obdo          eo_oa;
-        cfs_spinlock_t       eo_lock;
-        __u64                eo_lastino;
-        struct lustre_handle eo_nl_lock;
-        cfs_atomic_t         eo_prep;
+        struct obd_device_target eo_obt;
+        struct obdo              eo_oa;
+        cfs_spinlock_t           eo_lock;
+        __u64                    eo_lastino;
+        struct lustre_handle     eo_nl_lock;
+        cfs_atomic_t             eo_prep;
 };
 
 struct ost_obd {
@@ -986,19 +998,13 @@ struct obd_device {
         struct obd_type        *obd_type;
         __u32                   obd_magic;
 
-        int                     obd_minor;
-        cfs_hlist_node_t        obd_minor_node; /** < find by minor */
-
-        cfs_list_t              obd_list;
         /* common and UUID name of this device */
         char                    obd_name[MAX_OBD_NAME];
-        cfs_hlist_node_t        obd_name_node; /** < find by name */
-
         struct obd_uuid         obd_uuid;
-        cfs_hlist_node_t        obd_uuid_node; /** < find by uuid */
 
         struct lu_device       *obd_lu_dev;
 
+        int                     obd_minor;
         /* bitfield modification is protected by obd_dev_lock */
         unsigned long obd_attached:1,      /* finished attach */
                       obd_set_up:1,        /* finished setup */
@@ -1016,6 +1022,7 @@ struct obd_device {
                       obd_no_conn:1,       /* deny new connections */
                       obd_inactive:1,      /* device active/inactive
                                            * (for /proc/status only!!) */
+                      obd_no_ir:1,         /* no imperative recovery. */
                       obd_process_conf:1;  /* device is processing mgs config */
         /* use separate field as it is set in interrupt to don't mess with
          * protection of other bits using _bh lock */
@@ -1055,7 +1062,7 @@ struct obd_device {
         time_t                  obd_eviction_timer; /* for ping evictor */
 
         int                              obd_max_recoverable_clients;
-        int                              obd_connected_clients;
+        cfs_atomic_t                     obd_connected_clients;
         int                              obd_stale_clients;
         int                              obd_delayed_clients;
         /* this lock protects all recovery list_heads, timer and
@@ -1069,8 +1076,9 @@ struct obd_device {
         cfs_timer_t                      obd_recovery_timer;
         time_t                           obd_recovery_start; /* seconds */
         time_t                           obd_recovery_end; /* seconds, for lprocfs_status */
-        time_t                           obd_recovery_time_hard;
+        int                              obd_recovery_time_hard;
         int                              obd_recovery_timeout;
+        int                              obd_recovery_ir_factor;
 
         /* new recovery stuff from CMD2 */
         struct target_recovery_data      obd_recovery_data;
@@ -1163,12 +1171,12 @@ enum obd_cleanup_stage {
 #define KEY_REGISTER_TARGET     "register_target"
 #define KEY_REVIMP_UPD          "revimp_update"
 #define KEY_SET_FS              "set_fs"
+#define KEY_TGT_COUNT           "tgt_count"
 /*      KEY_SET_INFO in lustre_idl.h */
 #define KEY_SPTLRPC_CONF        "sptlrpc_conf"
 #define KEY_CONNECT_FLAG        "connect_flags"
 #define KEY_SYNC_LOCK_CANCEL    "sync_lock_cancel"
 
-
 struct lu_context;
 
 /* /!\ must be coherent with include/linux/namei.h on patched kernel */
@@ -1249,11 +1257,10 @@ struct md_enqueue_info {
         struct md_op_data       mi_data;
         struct lookup_intent    mi_it;
         struct lustre_handle    mi_lockh;
-        struct dentry          *mi_dentry;
         struct inode           *mi_dir;
         md_enqueue_cb_t         mi_cb;
+        __u64                   mi_cbdata;
         unsigned int            mi_generation;
-        void                   *mi_cbdata;
 };
 
 struct obd_ops {
@@ -1509,8 +1516,8 @@ struct md_ops {
         int (*m_sync)(struct obd_export *, const struct lu_fid *,
                       struct obd_capa *, struct ptlrpc_request **);
         int (*m_readpage)(struct obd_export *, const struct lu_fid *,
-                          struct obd_capa *, __u64, struct page *,
-                          struct ptlrpc_request **);
+                          struct obd_capa *, __u64, struct page **,
+                          unsigned, struct ptlrpc_request **);
 
         int (*m_unlink)(struct obd_export *, struct md_op_data *,
                         struct ptlrpc_request **);
@@ -1538,7 +1545,7 @@ struct md_ops {
                                       struct ptlrpc_request *);
         int (*m_clear_open_replay_data)(struct obd_export *,
                                         struct obd_client_handle *);
-        int (*m_set_lock_data)(struct obd_export *, __u64 *, void *, __u32 *);
+        int (*m_set_lock_data)(struct obd_export *, __u64 *, void *, __u64 *);
 
         ldlm_mode_t (*m_lock_match)(struct obd_export *, int,
                                     const struct lu_fid *, ldlm_type_t,
@@ -1562,7 +1569,7 @@ struct md_ops {
                                       struct ldlm_enqueue_info *);
 
         int (*m_revalidate_lock)(struct obd_export *, struct lookup_intent *,
-                                 struct lu_fid *);
+                                 struct lu_fid *, __u64 *bits);
 
         /*
          * NOTE: If adding ops, add another LPROCFS_MD_OP_INIT() line to
@@ -1667,4 +1674,11 @@ static inline struct md_open_data *obd_mod_alloc(void)
 extern void obdo_from_inode(struct obdo *dst, struct inode *src,
                             struct lu_fid *parent, obd_flag valid);
 
+/* return 1 if client should be resend request */
+static inline int client_should_resend(int resend, struct client_obd *cli)
+{
+        return cfs_atomic_read(&cli->cl_resends) ?
+               cfs_atomic_read(&cli->cl_resends) > resend : 1;
+}
+
 #endif /* __OBD_H */