- make va_size 64bit

 - couple minor code cleanups

diff --git a/lustre/dmu-osd/osd_handler.c b/lustre/dmu-osd/osd_handler.c
index 6054c57..4edc6cb 100644 (file)
--- a/lustre/dmu-osd/osd_handler.c
+++ b/lustre/dmu-osd/osd_handler.c
@@ -301,7 +301,7 @@ static void lu_attr2vnattr(struct lu_attr *la, vnattr_t *vap)
         }
 
         if (la->la_valid & LA_RDEV) {
-                vap->va_rdev   = la->la_rdev;
+                vap->va_rdev = la->la_rdev;
                 vap->va_mask |= DMU_AT_RDEV;
         }
 
@@ -1018,13 +1018,12 @@ static int osd_attr_get(const struct lu_env *env,
         LASSERT(dt_object_exists(dt));
         LASSERT(osd_invariant(obj));
 
-
         down(&obj->oo_guard);
         udmu_object_getattr(obj->oo_db, &vap);
         up(&obj->oo_guard);
         vnattr2lu_attr(&vap, attr);
 
-        CDEBUG(D_OTHER, "size = %lu\n", (unsigned long) attr->la_size);
+        CDEBUG(D_OTHER, "size = %Lu\n", attr->la_size);
         return 0;
 }
 

diff --git a/lustre/dmu-osd/udmu.c b/lustre/dmu-osd/udmu.c
index 64a8b50..61c2301 100644 (file)
--- a/lustre/dmu-osd/udmu.c
+++ b/lustre/dmu-osd/udmu.c
@@ -721,8 +721,10 @@ void udmu_object_getattr(dmu_buf_t *db, vnattr_t *vap)
         dnode_t *dn = ((dmu_buf_impl_t *)db)->db_dnode;
         znode_phys_t *zp = db->db_data;
 
-        vap->va_mask = DMU_AT_ATIME | DMU_AT_MTIME | DMU_AT_CTIME | DMU_AT_MODE | DMU_AT_SIZE |
-                       DMU_AT_UID | DMU_AT_GID | DMU_AT_TYPE | DMU_AT_NLINK | DMU_AT_RDEV;
+        vap->va_mask = DMU_AT_ATIME | DMU_AT_MTIME | DMU_AT_CTIME | DMU_AT_MODE
+                       | DMU_AT_SIZE | DMU_AT_UID | DMU_AT_GID | DMU_AT_TYPE
+                       | DMU_AT_NLINK | DMU_AT_RDEV;
+
         vap->va_atime.tv_sec    = zp->zp_atime[0];
         vap->va_atime.tv_nsec   = 0;
         vap->va_mtime.tv_sec    = zp->zp_mtime[0];

diff --git a/lustre/dmu-osd/udmu.h b/lustre/dmu-osd/udmu.h
index cf0f358..97d0df5 100644 (file)
--- a/lustre/dmu-osd/udmu.h
+++ b/lustre/dmu-osd/udmu.h
@@ -117,7 +117,7 @@ typedef struct vnattr {
         dev_t           va_fsid;        /* file system id (dev for now) */
         unsigned long long va_nodeid;   /* node id */
         nlink_t         va_nlink;       /* number of references to file */
-        off_t           va_size;        /* file size in bytes */
+        uint64_t        va_size;        /* file size in bytes */
         timestruc_t     va_atime;       /* time of last access */
         timestruc_t     va_mtime;       /* time of last modification */
         timestruc_t     va_ctime;       /* time of last status change */