Land b_head_quota onto HEAD (20081116_0105)

[fs/lustre-release.git] / lustre / osd / osd_internal.h

diff --git a/lustre/osd/osd_internal.h b/lustre/osd/osd_internal.h
index 359c19f..e187323 100644 (file)
--- a/lustre/osd/osd_internal.h
+++ b/lustre/osd/osd_internal.h
@@ -68,6 +68,14 @@ struct inode;
 
 #define OSD_COUNTERS (0)
 
+#ifdef HAVE_QUOTA_SUPPORT
+struct osd_ctxt {
+        __u32 oc_uid;
+        __u32 oc_gid;
+        __u32 oc_cap;
+};
+#endif
+
 /*
  * osd device.
  */
@@ -100,7 +108,7 @@ struct osd_device {
         __u32                     od_capa_alg;
         struct lustre_capa_key   *od_capa_keys;
         struct hlist_head        *od_capa_hash;
-        
+
         cfs_proc_dir_entry_t     *od_proc_entry;
         struct lprocfs_stats     *od_stats;
         /*
@@ -128,6 +136,10 @@ struct osd_thread_info {
         struct dentry          oti_dentry;
         struct timespec        oti_time;
         /*
+         * XXX temporary: fake struct file for osd_object_sync
+         */
+        struct file            oti_file;
+        /*
          * XXX temporary: for capa operations.
          */
         struct lustre_capa_key oti_capa_key;
@@ -140,10 +152,11 @@ struct osd_thread_info {
         char                   oti_ipd[DX_IPD_MAX_SIZE];
                 long long      oti_alignment_lieutenant;
         };
-#if OSD_COUNTERS
         int                    oti_r_locks;
         int                    oti_w_locks;
         int                    oti_txns;
+#ifdef HAVE_QUOTA_SUPPORT
+        struct osd_ctxt        oti_ctxt;
 #endif
 };