Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-14644 vvp: wait for nrpages to be updated
[fs/lustre-release.git]
/
lustre
/
llite
/
vvp_object.c
diff --git
a/lustre/llite/vvp_object.c
b/lustre/llite/vvp_object.c
index
cc3ea89
..
35c31e2
100644
(file)
--- a/
lustre/llite/vvp_object.c
+++ b/
lustre/llite/vvp_object.c
@@
-23,11
+23,10
@@
* Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
* Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2012, 201
5
, Intel Corporation.
+ * Copyright (c) 2012, 201
7
, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
*/
/*
* This file is part of Lustre, http://www.lustre.org/
- * Lustre is a trademark of Sun Microsystems, Inc.
*
* cl_object implementation for VVP layer.
*
*
* cl_object implementation for VVP layer.
*
@@
-37,9
+36,8
@@
#define DEBUG_SUBSYSTEM S_LLITE
#include <linux/user_namespace.h>
#define DEBUG_SUBSYSTEM S_LLITE
#include <linux/user_namespace.h>
-#ifdef HAVE_UIDGID_HEADER
-# include <linux/uidgid.h>
-#endif
+#include <linux/uidgid.h>
+
#include <libcfs/libcfs.h>
#include <obd.h>
#include <libcfs/libcfs.h>
#include <obd.h>
@@
-100,6
+98,7
@@
static int vvp_attr_get(const struct lu_env *env, struct cl_object *obj,
attr->cat_blocks = inode->i_blocks;
attr->cat_uid = from_kuid(&init_user_ns, inode->i_uid);
attr->cat_gid = from_kgid(&init_user_ns, inode->i_gid);
attr->cat_blocks = inode->i_blocks;
attr->cat_uid = from_kuid(&init_user_ns, inode->i_uid);
attr->cat_gid = from_kgid(&init_user_ns, inode->i_gid);
+ attr->cat_projid = ll_i2info(inode)->lli_projid;
/* KMS is not known by this layer */
return 0; /* layers below have to fill in the rest */
}
/* KMS is not known by this layer */
return 0; /* layers below have to fill in the rest */
}
@@
-121,8
+120,10
@@
static int vvp_attr_update(const struct lu_env *env, struct cl_object *obj,
inode->i_ctime.tv_sec = attr->cat_ctime;
if (0 && valid & CAT_SIZE)
i_size_write(inode, attr->cat_size);
inode->i_ctime.tv_sec = attr->cat_ctime;
if (0 && valid & CAT_SIZE)
i_size_write(inode, attr->cat_size);
+ if (valid & CAT_PROJID)
+ ll_i2info(inode)->lli_projid = attr->cat_projid;
/* not currently necessary */
/* not currently necessary */
- if (0 && valid & (CAT_UID|CAT_GID|CAT_SIZE))
+ if (0 && valid & (CAT_UID|CAT_GID|CAT_SIZE
|CAT_PROJID
))
mark_inode_dirty(inode);
return 0;
}
mark_inode_dirty(inode);
return 0;
}
@@
-148,6
+149,7
@@
static int vvp_conf_set(const struct lu_env *env, struct cl_object *obj,
* a price themselves. */
unmap_mapping_range(conf->coc_inode->i_mapping,
0, OBD_OBJECT_EOF, 0);
* a price themselves. */
unmap_mapping_range(conf->coc_inode->i_mapping,
0, OBD_OBJECT_EOF, 0);
+ pcc_layout_invalidate(conf->coc_inode);
}
return 0;
}
}
return 0;
}
@@
-165,7
+167,9
@@
static int vvp_prune(const struct lu_env *env, struct cl_object *obj)
RETURN(rc);
}
RETURN(rc);
}
- truncate_inode_pages(inode->i_mapping, 0);
+ ll_truncate_inode_pages_final(inode);
+ clear_bit(AS_EXITING, &inode->i_mapping->flags);
+
RETURN(0);
}
RETURN(0);
}
@@
-175,9
+179,9
@@
static int vvp_object_glimpse(const struct lu_env *env,
struct inode *inode = vvp_object_inode(obj);
ENTRY;
struct inode *inode = vvp_object_inode(obj);
ENTRY;
- lvb->lvb_mtime =
LTIME_S(inode->i_mtime)
;
- lvb->lvb_atime =
LTIME_S(inode->i_atime)
;
- lvb->lvb_ctime =
LTIME_S(inode->i_ctime)
;
+ lvb->lvb_mtime =
inode->i_mtime.tv_sec
;
+ lvb->lvb_atime =
inode->i_atime.tv_sec
;
+ lvb->lvb_ctime =
inode->i_ctime.tv_sec
;
/*
* LU-417: Add dirty pages block count lest i_blocks reports 0, some
/*
* LU-417: Add dirty pages block count lest i_blocks reports 0, some
@@
-195,26
+199,27
@@
static void vvp_req_attr_set(const struct lu_env *env, struct cl_object *obj,
{
struct inode *inode;
struct obdo *oa;
{
struct inode *inode;
struct obdo *oa;
- u64 valid_flags = OBD_MD_FLTYPE;
+ u64 valid_flags = OBD_MD_FLTYPE
| OBD_MD_FLUID | OBD_MD_FLGID
;
oa = attr->cra_oa;
inode = vvp_object_inode(obj);
if (attr->cra_type == CRT_WRITE) {
oa = attr->cra_oa;
inode = vvp_object_inode(obj);
if (attr->cra_type == CRT_WRITE) {
- valid_flags |= OBD_MD_FLMTIME | OBD_MD_FLCTIME |
- OBD_MD_FLUID | OBD_MD_FLGID;
+ valid_flags |= OBD_MD_FLMTIME | OBD_MD_FLCTIME;
obdo_set_o_projid(oa, ll_i2info(inode)->lli_projid);
obdo_set_o_projid(oa, ll_i2info(inode)->lli_projid);
+ } else if (attr->cra_type == CRT_READ) {
+ valid_flags |= OBD_MD_FLATIME;
}
obdo_from_inode(oa, inode, valid_flags & attr->cra_flags);
obdo_set_parent_fid(oa, &ll_i2info(inode)->lli_fid);
if (OBD_FAIL_CHECK(OBD_FAIL_LFSCK_INVALID_PFID))
oa->o_parent_oid++;
}
obdo_from_inode(oa, inode, valid_flags & attr->cra_flags);
obdo_set_parent_fid(oa, &ll_i2info(inode)->lli_fid);
if (OBD_FAIL_CHECK(OBD_FAIL_LFSCK_INVALID_PFID))
oa->o_parent_oid++;
- memcpy(attr->cra_jobid, ll_i2info(inode)->lli_jobid, LUSTRE_JOBID_SIZE);
+ memcpy(attr->cra_jobid, ll_i2info(inode)->lli_jobid,
+ sizeof(attr->cra_jobid));
}
static const struct cl_object_operations vvp_ops = {
.coo_page_init = vvp_page_init,
}
static const struct cl_object_operations vvp_ops = {
.coo_page_init = vvp_page_init,
- .coo_lock_init = vvp_lock_init,
.coo_io_init = vvp_io_init,
.coo_attr_get = vvp_attr_get,
.coo_attr_update = vvp_attr_update,
.coo_io_init = vvp_io_init,
.coo_attr_get = vvp_attr_get,
.coo_attr_update = vvp_attr_update,
@@
-257,13
+262,22
@@
static int vvp_object_init(const struct lu_env *env, struct lu_object *obj,
return result;
}
return result;
}
+static void vvp_object_free_rcu(struct rcu_head *head)
+{
+ struct vvp_object *vob = container_of(head, struct vvp_object,
+ vob_header.coh_lu.loh_rcu);
+
+ kmem_cache_free(vvp_object_kmem, vob);
+}
+
static void vvp_object_free(const struct lu_env *env, struct lu_object *obj)
{
struct vvp_object *vob = lu2vvp(obj);
lu_object_fini(obj);
lu_object_header_fini(obj->lo_header);
static void vvp_object_free(const struct lu_env *env, struct lu_object *obj)
{
struct vvp_object *vob = lu2vvp(obj);
lu_object_fini(obj);
lu_object_header_fini(obj->lo_header);
- OBD_SLAB_FREE_PTR(vob, vvp_object_kmem);
+ OBD_FREE_PRE(vob, sizeof(*vob), "slab-freed");
+ call_rcu(&vob->vob_header.coh_lu.loh_rcu, vvp_object_free_rcu);
}
static const struct lu_object_operations vvp_lu_obj_ops = {
}
static const struct lu_object_operations vvp_lu_obj_ops = {