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 8a147ed..e187323 100644 (file)
--- a/lustre/osd/osd_internal.h
+++ b/lustre/osd/osd_internal.h
@@ -1,29 +1,43 @@
 /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
  * vim:expandtab:shiftwidth=8:tabstop=8:
  *
- *  lustre/osd/osd_internal.h
- *  Shared definitions and declarations for osd module
+ * GPL HEADER START
  *
- *  Copyright (c) 2006 Cluster File Systems, Inc.
- *   Author: Nikita Danilov <nikita@clusterfs.com>
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *   This file is part of the Lustre file system, http://www.lustre.org
- *   Lustre is a trademark of Cluster File Systems, Inc.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 only,
+ * as published by the Free Software Foundation.
  *
- *   You may have signed or agreed to another license before downloading
- *   this software.  If so, you are bound by the terms and conditions
- *   of that agreement, and the following does not apply to you.  See the
- *   LICENSE file included with this distribution for more information.
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License version 2 for more details (a copy is included
+ * in the LICENSE file that accompanied this code).
  *
- *   If you did not agree to a different license, then this copy of Lustre
- *   is open source software; you can redistribute it and/or modify it
- *   under the terms of version 2 of the GNU General Public License as
- *   published by the Free Software Foundation.
+ * You should have received a copy of the GNU General Public License
+ * version 2 along with this program; If not, see
+ * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
  *
- *   In either case, Lustre is distributed in the hope that it will be
- *   useful, but WITHOUT ANY WARRANTY; without even the implied warranty
- *   of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   license text for more details.
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ * GPL HEADER END
+ */
+/*
+ * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Use is subject to license terms.
+ */
+/*
+ * This file is part of Lustre, http://www.lustre.org/
+ * Lustre is a trademark of Sun Microsystems, Inc.
+ *
+ * lustre/osd/osd_internal.h
+ *
+ * Shared definitions and declarations for osd module
+ *
+ * Author: Nikita Danilov <nikita@clusterfs.com>
  */
 
 #ifndef _OSD_INTERNAL_H
@@ -54,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.
  */
@@ -86,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;
         /*
@@ -114,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;
@@ -121,11 +147,16 @@ struct osd_thread_info {
 
         struct lu_fid_pack     oti_pack;
 
+        /* union to guarantee that ->oti_ipd[] has proper alignment. */
+        union {
         char                   oti_ipd[DX_IPD_MAX_SIZE];
-#if OSD_COUNTERS
+                long long      oti_alignment_lieutenant;
+        };
         int                    oti_r_locks;
         int                    oti_w_locks;
         int                    oti_txns;
+#ifdef HAVE_QUOTA_SUPPORT
+        struct osd_ctxt        oti_ctxt;
 #endif
 };