Fixed packing in obdcontrol

[fs/lustre-release.git] / lustre / include / linux / obd_support.h

diff --git a/lustre/include/linux/obd_support.h b/lustre/include/linux/obd_support.h
index 2c6e664..bc075e9 100644 (file)
--- a/lustre/include/linux/obd_support.h
+++ b/lustre/include/linux/obd_support.h
@@ -1,9 +1,14 @@
+
 #ifndef _OBD_SUPPORT
 #define _OBD_SUPPORT
 #include <linux/malloc.h>
 #include <linux/vmalloc.h>
 
-#define SIM_OBD_DEBUG
+#define EXT2_OBD_DEBUG
+
+
+#define MIN(a,b) (((a)<(b)) ? (a): (b))
+#define MAX(a,b) (((a)>(b)) ? (a): (b))
 
 /*
  * Debug code
@@ -15,8 +20,8 @@ extern int obd_print_entry;
 /* debugging masks */
 #define D_PSDEV       1 /* debug information from psdev.c */
 #define D_INODE       2
-#define D_UNUSED2     4
-#define D_UNUSED3     8
+#define D_SUPER       4
+#define D_SNAP        8
 #define D_UNUSED4    16
 #define D_WARNING    32 /* misc warnings */
 #define D_EXT2       64 /* anything from ext2_debug */
@@ -25,8 +30,9 @@ extern int obd_print_entry;
 #define D_INFO      512 /* general information, especially from interface.c */
 #define D_IOCTL    1024 /* ioctl related information */
 #define D_BLOCKS   2048 /* ext2 block allocation */
+#define D_RPC      4096 /* ext2 block allocation */
  
-#ifdef SIM_OBD_DEBUG
+#ifdef EXT2_OBD_DEBUG
 #define CDEBUG(mask, format, a...)                                     \
         do {                                                           \
        if (obd_debug_level & mask) {                                   \
@@ -40,27 +46,62 @@ extern int obd_print_entry;
 
 #define EXIT                                                                 \
         if (obd_print_entry)                                                 \
-                printk("Process %d leaving %s\n", current->pid, __FUNCTION__)
+                printk("Process %d leaving %s [%d]\n", current->pid, __FUNCTION__, __LINE__)
 
-#else /* SIM_OBD_DEBUG */
+#else /* EXT2_OBD_DEBUG */
 
 #       define CDEBUG ;
 #       define ENTRY ;
 #       define EXIT ;
 
-#endif /* SIM_OBD_DEBUG */
+#endif /* EXT2_OBD_DEBUG */
+
+
+#define CMD(cmd) (( cmd == READ ) ? "read" : "write")
+
+#define IDEBUG(inode) { \
+               printk("]]%s line %d[[  ino %ld, blocks %ld, size %Ld, atm %ld, ctim %ld, mtm %ld, mode %o, uid %d, gid %d\n", \
+                      __FUNCTION__ , __LINE__, \
+                      inode->i_ino, inode->i_blocks, inode->i_size,\
+                      inode->i_atime, inode->i_ctime, inode->i_mtime,\
+                      inode->i_mode, inode->i_uid, inode->i_gid);\
+               printk("blk: %d %d %d %d %d %d %d %d %d %d\n",\
+                      inode->u.ext2_i.i_data[0], inode->u.ext2_i.i_data[1],\
+                      inode->u.ext2_i.i_data[2], inode->u.ext2_i.i_data[3],\
+                      inode->u.ext2_i.i_data[4], inode->u.ext2_i.i_data[5],\
+                      inode->u.ext2_i.i_data[6], inode->u.ext2_i.i_data[7],\
+                      inode->u.ext2_i.i_data[8], inode->u.ext2_i.i_data[9]);\
+       }
+
+#define ODEBUG(obdo) { \
+               printk("]]%s line %d[[  id %Ld, atm %Ld, mtim %Ld, ctm %Ld, size %Ld, blocks %Ld\n",\
+                      __FUNCTION__ , __LINE__, \
+                      obdo->o_ino, obdo->o_atime, obdo->o_mtime,\
+                      obdo->o_ctime, obdo->o_size, obdo->o_blocks);\
+               printk("]]%s line %d[[  mode %o, uid %d, gid %d, flg %0x, obdflg %0x, nlnk %d, valid %0x\n", \
+                      __FUNCTION__ , __LINE__, \
+                      obdo->o_mode, obdo->o_uid, obdo->o_gid,\
+                      obdo->o_flags, obdo->o_obdflags, obdo->o_nlink,\
+                      obdo->o_valid);\
+               printk("blk: %d %d %d %d %d %d %d %d %d %d\n",\
+                      ((long)obdo->o_inline)[0], ((long)obdo->o_inline)[1],\
+                      ((long)obdo->o_inline)[2], ((long)obdo->o_inline)[3],\
+                      ((long)obdo->o_inline)[4], ((long)obdo->o_inline)[5],\
+                      ((long)obdo->o_inline)[6], ((long)obdo->o_inline)[7],\
+                      ((long)obdo->o_inline)[8], ((long)obdo->o_inline)[9]);\
+       }
 
-#define PDEBUG(page,cmd)       {\
-               char *command = ( cmd == READ ) ? "read" : "write";\
+
+#define PDEBUG(page,cmd)       {if (page){\
                char *uptodate = (Page_Uptodate(page)) ? "yes" : "no";\
                char *locked = (PageLocked(page)) ? "yes" : "no";\
                int count = page->count.counter;\
-               long ino = (page->inode) ? page->inode->i_ino : -1;\
+                long index = page->index;\
                \
-               CDEBUG(D_IOCTL, " ** %s, cmd: %s, ino: %ld, uptodate: %s, "\
-                      "locked: %s, cnt %d ** \n", __FUNCTION__,\
-                      command, ino, uptodate, locked, count);\
-       }
+               CDEBUG(D_IOCTL, " ** %s, cmd: %s, off %ld, uptodate: %s, "\
+                      "locked: %s, cnt %d page %p pages %ld** \n", __FUNCTION__,\
+                      cmd, index, uptodate, locked, count, page, (!page->mapping) ? -1 : page->mapping->nrpages);\
+       } else { CDEBUG(D_IOCTL, "** %s, no page\n", __FUNCTION__); }}
 
 
 #define OBD_ALLOC(ptr, cast, size)                                     \
@@ -94,4 +135,22 @@ do {                                                        \
        }                                               \
 } while (0)
 
+
+static inline struct page *addr_to_page(char *buf)
+{
+       unsigned long addr = (unsigned long)buf;
+        unsigned long map_nr;
+
+#ifdef CONFIG_DISCONTIGMEM
+        if (addr == 0) return;
+#endif
+        map_nr = MAP_NR(addr);
+        if (map_nr < max_mapnr)
+               return mem_map + map_nr;
+       else 
+               return 0;
+}
+
+
+
 #endif