Updated parameters for obdfs_writepage() to use struct *dentry instead of

[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 01d69f7..ba262a3 100644 (file)
--- a/lustre/include/linux/obd_support.h
+++ b/lustre/include/linux/obd_support.h
@@ -21,7 +21,7 @@ extern int obd_print_entry;
 #define D_PSDEV       1 /* debug information from psdev.c */
 #define D_INODE       2
 #define D_SUPER       4
-#define D_UNUSED3     8
+#define D_SNAP        8
 #define D_UNUSED4    16
 #define D_WARNING    32 /* misc warnings */
 #define D_EXT2       64 /* anything from ext2_debug */
@@ -73,11 +73,11 @@ extern int obd_print_entry;
                char *uptodate = (Page_Uptodate(page)) ? "yes" : "no";\
                char *locked = (PageLocked(page)) ? "yes" : "no";\
                int count = page->count.counter;\
-                long offset = page->offset;\
+                long index = page->index;\
                \
                CDEBUG(D_IOCTL, " ** %s, cmd: %s, off %ld, uptodate: %s, "\
                       "locked: %s, cnt %d page %p pages %ld** \n", __FUNCTION__,\
-                      cmd, offset, uptodate, locked, count, page, page->mapping->nrpages);\
+                      cmd, index, uptodate, locked, count, page, (!page->mapping) ? -1 : page->mapping->nrpages);\
        } else { CDEBUG(D_IOCTL, "** %s, no page\n", __FUNCTION__); }}
 
 
@@ -140,18 +140,13 @@ static inline void inode_cpy(struct inode *dest, struct inode *src)
        dest->i_flags = src->i_flags;
        /* allocation of space */
        dest->i_blocks = src->i_blocks;
-
-       if ( !dest->i_blocks) 
-               memcpy(&dest->u, &src->u, sizeof(src->u));
+       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));
+       }
 }
 
 
 
-
-
-
-
-
-
-
 #endif