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 ba262a3..bc075e9 100644 (file)
--- a/lustre/include/linux/obd_support.h
+++ b/lustre/include/linux/obd_support.h
@@ -60,13 +60,36 @@ extern int obd_print_entry;
 #define CMD(cmd) (( cmd == READ ) ? "read" : "write")
 
 #define IDEBUG(inode) { \
-       if ( !list_empty(&inode->i_data.pages) || inode->i_data.nrpages ) {\
-               struct page * page;\
-               printk("XXXXX: func %s line %d ino %ld list not empty, pages %ld\n", __FUNCTION__ , __LINE__,\
-                      inode->i_ino, inode->i_data.nrpages);\
-               page = list_entry(inode->i_data.pages.next, struct page , list);\
-               PDEBUG(page, "READ 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)       {if (page){\
@@ -113,38 +136,19 @@ do {                                                      \
 } while (0)
 
 
-
-static inline void inode_to_iattr(struct inode *inode, struct iattr *tmp)
+static inline struct page *addr_to_page(char *buf)
 {
-       tmp->ia_mode = inode->i_mode;
-       tmp->ia_uid = inode->i_uid;
-       tmp->ia_gid = inode->i_gid;
-       tmp->ia_size = inode->i_size;
-       tmp->ia_atime = inode->i_atime;
-       tmp->ia_mtime = inode->i_mtime;
-       tmp->ia_ctime = inode->i_ctime;
-       /*      tmp->ia_flags = inode->i_flags; */
-
-       tmp->ia_valid = ~0;
-}
+       unsigned long addr = (unsigned long)buf;
+        unsigned long map_nr;
 
-static inline void inode_cpy(struct inode *dest, struct inode *src)
-{
-       dest->i_mode = src->i_mode;
-       dest->i_uid = src->i_uid;
-       dest->i_gid = src->i_gid;
-       dest->i_size = src->i_size;
-       dest->i_atime = src->i_atime;
-       dest->i_mtime = src->i_mtime;
-       dest->i_ctime = src->i_ctime;
-       dest->i_flags = src->i_flags;
-       /* allocation of space */
-       dest->i_blocks = src->i_blocks;
-       if ( !dest->i_blocks) {
-               CDEBUG(D_IOCTL, "copying inline data: ino %ld\n", dest->i_ino);
-               memcpy(&dest->u.ext2_i.i_data, &src->u.ext2_i.i_data, 
-                      sizeof(src->u.ext2_i.i_data));
-       }
+#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;
 }