LU-4838 osd: object iterator in zfs to sync before iteration

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

diff --git a/lustre/obdclass/obdo.c b/lustre/obdclass/obdo.c
index f35fb01..5604600 100644 (file)
--- a/lustre/obdclass/obdo.c
+++ b/lustre/obdclass/obdo.c
@@ -103,19 +103,19 @@ void obdo_from_inode(struct obdo *dst, struct inode *src, obd_flag valid)
                               (src->i_mode & S_IALLUGO);
                 newvalid |= OBD_MD_FLMODE;
         }
-        if (valid & OBD_MD_FLUID) {
-                dst->o_uid = src->i_uid;
-                newvalid |= OBD_MD_FLUID;
-        }
-        if (valid & OBD_MD_FLGID) {
-                dst->o_gid = src->i_gid;
-                newvalid |= OBD_MD_FLGID;
-        }
-        if (valid & OBD_MD_FLFLAGS) {
-                dst->o_flags = ll_inode_flags(src);
-                newvalid |= OBD_MD_FLFLAGS;
-        }
-        dst->o_valid |= newvalid;
+       if (valid & OBD_MD_FLUID) {
+               dst->o_uid = from_kuid(&init_user_ns, src->i_uid);
+               newvalid |= OBD_MD_FLUID;
+       }
+       if (valid & OBD_MD_FLGID) {
+               dst->o_gid = from_kgid(&init_user_ns, src->i_gid);
+               newvalid |= OBD_MD_FLGID;
+       }
+       if (valid & OBD_MD_FLFLAGS) {
+               dst->o_flags = ll_inode_flags(src);
+               newvalid |= OBD_MD_FLFLAGS;
+       }
+       dst->o_valid |= newvalid;
 }
 EXPORT_SYMBOL(obdo_from_inode);
 
@@ -231,25 +231,25 @@ void obdo_from_iattr(struct obdo *oa, struct iattr *attr, unsigned int ia_valid)
                 oa->o_ctime = LTIME_S(attr->ia_ctime);
                 oa->o_valid |= OBD_MD_FLCTIME;
         }
-        if (ia_valid & ATTR_SIZE) {
-                oa->o_size = attr->ia_size;
-                oa->o_valid |= OBD_MD_FLSIZE;
-        }
+       if (ia_valid & ATTR_SIZE) {
+               oa->o_size = attr->ia_size;
+               oa->o_valid |= OBD_MD_FLSIZE;
+       }
        if (ia_valid & ATTR_MODE) {
                oa->o_mode = attr->ia_mode;
                oa->o_valid |= OBD_MD_FLTYPE | OBD_MD_FLMODE;
-               if (!in_group_p(oa->o_gid) &&
-                   !cfs_capable(CAP_FSETID))
+               if (!in_group_p(make_kgid(&init_user_ns, oa->o_gid)) &&
+                   !cfs_capable(CFS_CAP_FSETID))
                        oa->o_mode &= ~S_ISGID;
        }
-        if (ia_valid & ATTR_UID) {
-                oa->o_uid = attr->ia_uid;
-                oa->o_valid |= OBD_MD_FLUID;
-        }
-        if (ia_valid & ATTR_GID) {
-                oa->o_gid = attr->ia_gid;
-                oa->o_valid |= OBD_MD_FLGID;
-        }
+       if (ia_valid & ATTR_UID) {
+               oa->o_uid = from_kuid(&init_user_ns, attr->ia_uid);
+               oa->o_valid |= OBD_MD_FLUID;
+       }
+       if (ia_valid & ATTR_GID) {
+               oa->o_gid = from_kgid(&init_user_ns, attr->ia_gid);
+               oa->o_valid |= OBD_MD_FLGID;
+       }
 }
 EXPORT_SYMBOL(obdo_from_iattr);
 
@@ -287,16 +287,16 @@ void iattr_from_obdo(struct iattr *attr, struct obdo *oa, obd_flag valid)
         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(oa->o_gid) &&
-                   !cfs_capable(CAP_FSETID))
+               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 = oa->o_uid;
+               attr->ia_uid = make_kuid(&init_user_ns, oa->o_uid);
                 attr->ia_valid |= ATTR_UID;
         }
         if (valid & OBD_MD_FLGID) {
-                attr->ia_gid = oa->o_gid;
+               attr->ia_gid = make_kgid(&init_user_ns, oa->o_gid);
                 attr->ia_valid |= ATTR_GID;
         }
 }
@@ -332,38 +332,3 @@ void obdo_from_md(struct obdo *oa, struct md_op_data *op_data,
         }
 }
 EXPORT_SYMBOL(obdo_from_md);
-
-void obdo_cpu_to_le(struct obdo *dobdo, struct obdo *sobdo)
-{
-       dobdo->o_size = cpu_to_le64(sobdo->o_size);
-       dobdo->o_mtime = cpu_to_le64(sobdo->o_mtime);
-       dobdo->o_atime = cpu_to_le64(sobdo->o_atime);
-       dobdo->o_ctime = cpu_to_le64(sobdo->o_ctime);
-       dobdo->o_blocks = cpu_to_le64(sobdo->o_blocks);
-       dobdo->o_mode = cpu_to_le32(sobdo->o_mode);
-       dobdo->o_uid = cpu_to_le32(sobdo->o_uid);
-       dobdo->o_gid = cpu_to_le32(sobdo->o_gid);
-       dobdo->o_flags = cpu_to_le32(sobdo->o_flags);
-       dobdo->o_nlink = cpu_to_le32(sobdo->o_nlink);
-       dobdo->o_blksize = cpu_to_le32(sobdo->o_blksize);
-       dobdo->o_valid = cpu_to_le64(sobdo->o_valid);
-}
-EXPORT_SYMBOL(obdo_cpu_to_le);
-
-void obdo_le_to_cpu(struct obdo *dobdo, struct obdo *sobdo)
-{
-       dobdo->o_size = le64_to_cpu(sobdo->o_size);
-       dobdo->o_mtime = le64_to_cpu(sobdo->o_mtime);
-       dobdo->o_atime = le64_to_cpu(sobdo->o_atime);
-       dobdo->o_ctime = le64_to_cpu(sobdo->o_ctime);
-       dobdo->o_blocks = le64_to_cpu(sobdo->o_blocks);
-       dobdo->o_mode = le32_to_cpu(sobdo->o_mode);
-       dobdo->o_uid = le32_to_cpu(sobdo->o_uid);
-       dobdo->o_gid = le32_to_cpu(sobdo->o_gid);
-       dobdo->o_flags = le32_to_cpu(sobdo->o_flags);
-       dobdo->o_nlink = le32_to_cpu(sobdo->o_nlink);
-       dobdo->o_blksize = le32_to_cpu(sobdo->o_blksize);
-       dobdo->o_valid = le64_to_cpu(sobdo->o_valid);
-}
-EXPORT_SYMBOL(obdo_le_to_cpu);
-