LU-9153 llog: update llog print format to use FIDs

[fs/lustre-release.git] / lustre / obdclass / linux / linux-obdo.c

diff --git a/lustre/obdclass/linux/linux-obdo.c b/lustre/obdclass/linux/linux-obdo.c
index 4a56248..5f8e2b5 100644 (file)
--- a/lustre/obdclass/linux/linux-obdo.c
+++ b/lustre/obdclass/linux/linux-obdo.c
@@ -15,11 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
@@ -44,14 +40,14 @@
 
 #include <linux/fs.h>
 #include <linux/module.h>
-#include <linux/pagemap.h> /* for PAGE_CACHE_SIZE */
+#include <linux/pagemap.h> /* for PAGE_SIZE */
 #include <lustre/lustre_idl.h>
 #include <obd_class.h>
 
 /*FIXME: Just copy from obdo_from_inode*/
-void obdo_from_la(struct obdo *dst, const struct lu_attr *la, __u64 valid)
+void obdo_from_la(struct obdo *dst, const struct lu_attr *la, u64 valid)
 {
-       u32 newvalid = 0;
+       u64 newvalid = 0;
 
         if (valid & LA_ATIME) {
                 dst->o_atime = la->la_atime;
@@ -91,6 +87,10 @@ void obdo_from_la(struct obdo *dst, const struct lu_attr *la, __u64 valid)
                 dst->o_gid = la->la_gid;
                 newvalid |= OBD_MD_FLGID;
         }
+       if (valid & LA_PROJID) {
+               dst->o_projid = la->la_projid;
+               newvalid |= OBD_MD_FLPROJID;
+       }
        if (valid & LA_FLAGS) {
                dst->o_flags = la->la_flags;
                newvalid |= OBD_MD_FLFLAGS;
@@ -100,9 +100,9 @@ void obdo_from_la(struct obdo *dst, const struct lu_attr *la, __u64 valid)
 EXPORT_SYMBOL(obdo_from_la);
 
 /*FIXME: Just copy from obdo_from_inode*/
-void la_from_obdo(struct lu_attr *dst, const struct obdo *obdo, u32 valid)
+void la_from_obdo(struct lu_attr *dst, const struct obdo *obdo, u64 valid)
 {
-        __u64 newvalid = 0;
+       u64 newvalid = 0;
 
         valid &= obdo->o_valid;
 
@@ -144,6 +144,10 @@ void la_from_obdo(struct lu_attr *dst, const struct obdo *obdo, u32 valid)
                 dst->la_gid = obdo->o_gid;
                 newvalid |= LA_GID;
         }
+       if (valid & OBD_MD_FLPROJID) {
+               dst->la_projid = obdo->o_projid;
+               newvalid |= LA_PROJID;
+       }
        if (valid & OBD_MD_FLFLAGS) {
                dst->la_flags = obdo->o_flags;
                newvalid |= LA_FLAGS;
@@ -151,39 +155,3 @@ void la_from_obdo(struct lu_attr *dst, const struct obdo *obdo, u32 valid)
        dst->la_valid = newvalid;
 }
 EXPORT_SYMBOL(la_from_obdo);
-
-void obdo_refresh_inode(struct inode *dst, const struct obdo *src,
-                       u32 valid)
-{
-        valid &= src->o_valid;
-
-        if (valid & (OBD_MD_FLCTIME | OBD_MD_FLMTIME))
-                CDEBUG(D_INODE,
-                       "valid "LPX64", cur time %lu/%lu, new "LPU64"/"LPU64"\n",
-                       src->o_valid, LTIME_S(dst->i_mtime),
-                       LTIME_S(dst->i_ctime), src->o_mtime, src->o_ctime);
-
-        if (valid & OBD_MD_FLATIME && src->o_atime > LTIME_S(dst->i_atime))
-                LTIME_S(dst->i_atime) = src->o_atime;
-        if (valid & OBD_MD_FLMTIME && src->o_mtime > LTIME_S(dst->i_mtime))
-                LTIME_S(dst->i_mtime) = src->o_mtime;
-        if (valid & OBD_MD_FLCTIME && src->o_ctime > LTIME_S(dst->i_ctime))
-                LTIME_S(dst->i_ctime) = src->o_ctime;
-        if (valid & OBD_MD_FLSIZE)
-                i_size_write(dst, src->o_size);
-       /* optimum IO size */
-       if (valid & OBD_MD_FLBLKSZ && src->o_blksize > (1 << dst->i_blkbits))
-               dst->i_blkbits = ffs(src->o_blksize) - 1;
-
-       if (dst->i_blkbits < PAGE_CACHE_SHIFT)
-               dst->i_blkbits = PAGE_CACHE_SHIFT;
-
-        /* allocation of space */
-        if (valid & OBD_MD_FLBLOCKS && src->o_blocks > dst->i_blocks)
-                /*
-                 * XXX shouldn't overflow be checked here like in
-                 * obdo_to_inode().
-                 */
-                dst->i_blocks = src->o_blocks;
-}
-EXPORT_SYMBOL(obdo_refresh_inode);