LU-7815 mdt: pinger should not evict MDT-MDT export

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

diff --git a/lustre/obdclass/obdo.c b/lustre/obdclass/obdo.c
index 4ac18b4..45cb2f4 100644 (file)
--- a/lustre/obdclass/obdo.c
+++ b/lustre/obdclass/obdo.c
@@ -27,7 +27,7 @@
  * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, 2013, Intel Corporation.
+ * Copyright (c) 2012, 2014, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -42,6 +42,10 @@
 
 #define DEBUG_SUBSYSTEM S_CLASS
 
+#include <linux/user_namespace.h>
+#ifdef HAVE_UIDGID_HEADER
+# include <linux/uidgid.h>
+#endif
 #include <obd_class.h>
 #include <lustre/lustre_idl.h>
 
@@ -56,14 +60,14 @@ EXPORT_SYMBOL(obdo_set_parent_fid);
 
 /* WARNING: the file systems must take care not to tinker with
    attributes they don't manage (such as blocks). */
-void obdo_from_inode(struct obdo *dst, struct inode *src, obd_flag valid)
+void obdo_from_inode(struct obdo *dst, struct inode *src, u64 valid)
 {
-        obd_flag newvalid = 0;
+       u64 newvalid = 0;
 
-        if (valid & (OBD_MD_FLCTIME | OBD_MD_FLMTIME))
-                CDEBUG(D_INODE, "valid %x, new time %lu/%lu\n",
-                       valid, LTIME_S(src->i_mtime),
-                       LTIME_S(src->i_ctime));
+       if (valid & (OBD_MD_FLCTIME | OBD_MD_FLMTIME))
+               CDEBUG(D_INODE, "valid "LPX64", new time %lu/%lu\n",
+                       valid, LTIME_S(src->i_mtime),
+                       LTIME_S(src->i_ctime));
 
         if (valid & OBD_MD_FLATIME) {
                 dst->o_atime = LTIME_S(src->i_atime);
@@ -86,7 +90,7 @@ void obdo_from_inode(struct obdo *dst, struct inode *src, obd_flag valid)
                 newvalid |= OBD_MD_FLBLOCKS;
         }
         if (valid & OBD_MD_FLBLKSZ) {   /* optimal block size */
-                dst->o_blksize = ll_inode_blksize(src);
+               dst->o_blksize = 1U << src->i_blkbits;
                 newvalid |= OBD_MD_FLBLKSZ;
         }
         if (valid & OBD_MD_FLTYPE) {
@@ -108,14 +112,14 @@ void obdo_from_inode(struct obdo *dst, struct inode *src, obd_flag valid)
                newvalid |= OBD_MD_FLGID;
        }
        if (valid & OBD_MD_FLFLAGS) {
-               dst->o_flags = ll_inode_flags(src);
+               dst->o_flags = src->i_flags;
                newvalid |= OBD_MD_FLFLAGS;
        }
        dst->o_valid |= newvalid;
 }
 EXPORT_SYMBOL(obdo_from_inode);
 
-void obdo_cpy_md(struct obdo *dst, const struct obdo *src, obd_flag valid)
+void obdo_cpy_md(struct obdo *dst, const struct obdo *src, u64 valid)
 {
         CDEBUG(D_INODE, "src obdo "DOSTID" valid "LPX64", dst obdo "DOSTID"\n",
                POSTID(&src->o_oi), src->o_valid, POSTID(&dst->o_oi));
@@ -149,8 +153,6 @@ void obdo_cpy_md(struct obdo *dst, const struct obdo *src, obd_flag valid)
                 dst->o_parent_oid = src->o_parent_oid;
         if (valid & OBD_MD_FLHANDLE)
                 dst->o_handle = src->o_handle;
-        if (valid & OBD_MD_FLCOOKIE)
-                dst->o_lcookie = src->o_lcookie;
 
         dst->o_valid |= valid;
 }
@@ -167,68 +169,3 @@ void obdo_to_ioobj(const struct obdo *oa, struct obd_ioobj *ioobj)
        ioobj->ioo_max_brw = 0;
 }
 EXPORT_SYMBOL(obdo_to_ioobj);
-
-static void iattr_from_obdo(struct iattr *attr, const struct obdo *oa,
-                           obd_flag valid)
-{
-        valid &= oa->o_valid;
-
-        if (valid & (OBD_MD_FLCTIME | OBD_MD_FLMTIME))
-                CDEBUG(D_INODE, "valid "LPX64", new time "LPU64"/"LPU64"\n",
-                       oa->o_valid, oa->o_mtime, oa->o_ctime);
-
-        attr->ia_valid = 0;
-        if (valid & OBD_MD_FLATIME) {
-                LTIME_S(attr->ia_atime) = oa->o_atime;
-                attr->ia_valid |= ATTR_ATIME;
-        }
-        if (valid & OBD_MD_FLMTIME) {
-                LTIME_S(attr->ia_mtime) = oa->o_mtime;
-                attr->ia_valid |= ATTR_MTIME;
-        }
-        if (valid & OBD_MD_FLCTIME) {
-                LTIME_S(attr->ia_ctime) = oa->o_ctime;
-                attr->ia_valid |= ATTR_CTIME;
-        }
-        if (valid & OBD_MD_FLSIZE) {
-                attr->ia_size = oa->o_size;
-                attr->ia_valid |= ATTR_SIZE;
-        }
-#if 0   /* you shouldn't be able to change a file's type with setattr */
-        if (valid & OBD_MD_FLTYPE) {
-                attr->ia_mode = (attr->ia_mode & ~S_IFMT)|(oa->o_mode & S_IFMT);
-                attr->ia_valid |= ATTR_MODE;
-        }
-#endif
-        if (valid & OBD_MD_FLMODE) {
-               attr->ia_mode = (attr->ia_mode & S_IFMT)|(oa->o_mode & ~S_IFMT);
-               attr->ia_valid |= ATTR_MODE;
-               if (!in_group_p(make_kgid(&init_user_ns, oa->o_gid)) &&
-                   !cfs_capable(CFS_CAP_FSETID))
-                       attr->ia_mode &= ~S_ISGID;
-        }
-        if (valid & OBD_MD_FLUID) {
-               attr->ia_uid = make_kuid(&init_user_ns, oa->o_uid);
-                attr->ia_valid |= ATTR_UID;
-        }
-        if (valid & OBD_MD_FLGID) {
-               attr->ia_gid = make_kgid(&init_user_ns, oa->o_gid);
-                attr->ia_valid |= ATTR_GID;
-        }
-}
-
-void md_from_obdo(struct md_op_data *op_data, const struct obdo *oa,
-                 obd_flag valid)
-{
-        iattr_from_obdo(&op_data->op_attr, oa, valid);
-        if (valid & OBD_MD_FLBLOCKS) {
-                op_data->op_attr_blocks = oa->o_blocks;
-                op_data->op_attr.ia_valid |= ATTR_BLOCKS;
-        }
-        if (valid & OBD_MD_FLFLAGS) {
-                ((struct ll_iattr *)&op_data->op_attr)->ia_attr_flags =
-                        oa->o_flags;
-                op_data->op_attr.ia_valid |= ATTR_ATTR_FLAG;
-        }
-}
-EXPORT_SYMBOL(md_from_obdo);