LU-9184 grants: move grant code to the target

[fs/lustre-release.git] / lustre / include / lustre_export.h

diff --git a/lustre/include/lustre_export.h b/lustre/include/lustre_export.h
index 2419e49..b5ca7f7 100644 (file)
--- a/lustre/include/lustre_export.h
+++ b/lustre/include/lustre_export.h
@@ -23,7 +23,7 @@
  * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2015, Intel Corporation.
+ * Copyright (c) 2011, 2016, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -94,6 +94,11 @@ struct tg_export_data {
        int                     ted_reply_max; /* high water mark */
        int                     ted_release_xid;
        int                     ted_release_tag;
+       /* grants */
+       long                    ted_dirty;    /* in bytes */
+       long                    ted_grant;    /* in bytes */
+       long                    ted_pending;  /* bytes just being written */
+       __u8                    ted_pagebits; /* log2 of client page size */
 };
 
 /**
@@ -116,16 +121,12 @@ struct filter_export_data {
        struct tg_export_data   fed_ted;
        spinlock_t              fed_lock;       /**< protects fed_mod_list */
        __u64                   fed_lastid_gen;
-       long                    fed_dirty;    /* in bytes */
-       long                    fed_grant;    /* in bytes */
        struct list_head        fed_mod_list; /* files being modified */
-       long                    fed_pending;  /* bytes just being written */
        /* count of SOFT_SYNC RPCs, which will be reset after
         * ofd_soft_sync_limit number of RPCs, and trigger a sync. */
        atomic_t                fed_soft_sync_count;
        int                     fed_mod_count;/* items in fed_writing list */
        __u32                   fed_group;
-       __u8                    fed_pagebits; /* log2 of client page size */
 };
 
 struct mgs_export_data {
@@ -274,7 +275,7 @@ struct obd_export {
         enum lustre_sec_part      exp_sp_peer;
         struct sptlrpc_flavor     exp_flvr;             /* current */
         struct sptlrpc_flavor     exp_flvr_old[2];      /* about-to-expire */
-        cfs_time_t                exp_flvr_expire[2];   /* seconds */
+       time64_t                  exp_flvr_expire[2];   /* seconds */
 
         /** protects exp_hp_rpcs */
        spinlock_t              exp_rpc_lock;