X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fllite%2Fvvp_object.c;h=5bc18632ca48b04a65b0a9bcb8a885ae86987963;hb=baf067a765ba658ea16e8f81909d6a364a6f5b18;hp=21837e4d00737f35e19a354c115503406abae441;hpb=6e3ec5812ebd1b5ecf7cae584f429b013ffe7431;p=fs%2Flustre-release.git

diff --git a/lustre/llite/vvp_object.c b/lustre/llite/vvp_object.c
index 21837e4..5bc1863 100644
--- a/lustre/llite/vvp_object.c
+++ b/lustre/llite/vvp_object.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  */
 /*
@@ -64,13 +64,13 @@ static int vvp_object_print(const struct lu_env *env, void *cookie,
         struct inode         *inode = obj->cob_inode;
         struct ll_inode_info *lli;
 
-        (*p)(env, cookie, "(%s %i %i) inode: %p ",
+        (*p)(env, cookie, "(%s %d %d) inode: %p ",
              cfs_list_empty(&obj->cob_pending_list) ? "-" : "+",
              obj->cob_transient_pages, cfs_atomic_read(&obj->cob_mmap_cnt),
              inode);
         if (inode) {
                 lli = ll_i2info(inode);
-                (*p)(env, cookie, "%lu/%u %o %u %i %p "DFID,
+                (*p)(env, cookie, "%lu/%u %o %u %d %p "DFID,
                      inode->i_ino, inode->i_generation, inode->i_mode,
                      inode->i_nlink, atomic_read(&inode->i_count),
                      lli->lli_clob, PFID(&lli->lli_fid));
@@ -109,8 +109,14 @@ static int vvp_attr_set(const struct lu_env *env, struct cl_object *obj,
                 inode->i_uid = attr->cat_uid;
         if (valid & CAT_GID)
                 inode->i_gid = attr->cat_gid;
+        if (valid & CAT_ATIME)
+                LTIME_S(inode->i_atime) = attr->cat_atime;
+        if (valid & CAT_MTIME)
+                LTIME_S(inode->i_mtime) = attr->cat_mtime;
+        if (valid & CAT_CTIME)
+                LTIME_S(inode->i_ctime) = attr->cat_ctime;
         if (0 && valid & CAT_SIZE)
-                i_size_write(inode, attr->cat_size);
+                cl_isize_write_nolock(inode, attr->cat_size);
         /* not currently necessary */
         if (0 && valid & (CAT_UID|CAT_GID|CAT_SIZE))
                 mark_inode_dirty(inode);