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-1538 tests: standardize test script init – failover
[fs/lustre-release.git]
/
lustre
/
llite
/
vvp_object.c
diff --git
a/lustre/llite/vvp_object.c
b/lustre/llite/vvp_object.c
index
56513eb
..
51e1bba
100644
(file)
--- a/
lustre/llite/vvp_object.c
+++ b/
lustre/llite/vvp_object.c
@@
-23,7
+23,7
@@
* 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/
@@
-37,9
+37,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>
@@
-94,12
+93,13
@@
static int vvp_attr_get(const struct lu_env *env, struct cl_object *obj,
*/
attr->cat_size = i_size_read(inode);
*/
attr->cat_size = i_size_read(inode);
- attr->cat_mtime =
LTIME_S(inode->i_mtime)
;
- attr->cat_atime =
LTIME_S(inode->i_atime)
;
- attr->cat_ctime =
LTIME_S(inode->i_ctime)
;
+ attr->cat_mtime =
inode->i_mtime.tv_sec
;
+ attr->cat_atime =
inode->i_atime.tv_sec
;
+ attr->cat_ctime =
inode->i_ctime.tv_sec
;
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 */
}
@@
-114,15
+114,17
@@
static int vvp_attr_update(const struct lu_env *env, struct cl_object *obj,
if (valid & CAT_GID)
inode->i_gid = make_kgid(&init_user_ns, attr->cat_gid);
if (valid & CAT_ATIME)
if (valid & CAT_GID)
inode->i_gid = make_kgid(&init_user_ns, attr->cat_gid);
if (valid & CAT_ATIME)
-
LTIME_S(inode->i_atime)
= attr->cat_atime;
+
inode->i_atime.tv_sec
= attr->cat_atime;
if (valid & CAT_MTIME)
if (valid & CAT_MTIME)
-
LTIME_S(inode->i_mtime)
= attr->cat_mtime;
+
inode->i_mtime.tv_sec
= attr->cat_mtime;
if (valid & CAT_CTIME)
if (valid & CAT_CTIME)
-
LTIME_S(inode->i_ctime)
= attr->cat_ctime;
+
inode->i_ctime.tv_sec
= attr->cat_ctime;
if (0 && valid & CAT_SIZE)
i_size_write(inode, attr->cat_size);
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;
}
@@
-147,7
+149,8
@@
static int vvp_conf_set(const struct lu_env *env, struct cl_object *obj,
* This operation is expensive but mmap processes have to pay
* a price themselves. */
unmap_mapping_range(conf->coc_inode->i_mapping,
* This operation is expensive but mmap processes have to pay
* a price themselves. */
unmap_mapping_range(conf->coc_inode->i_mapping,
- 0, OBD_OBJECT_EOF, 0);
+ 0, OBD_OBJECT_EOF, 1);
+ pcc_layout_invalidate(conf->coc_inode);
}
return 0;
}
}
return 0;
}
@@
-166,6
+169,13
@@
static int vvp_prune(const struct lu_env *env, struct cl_object *obj)
}
truncate_inode_pages(inode->i_mapping, 0);
}
truncate_inode_pages(inode->i_mapping, 0);
+ if (inode->i_mapping->nrpages) {
+ CDEBUG(D_VFSTRACE, DFID ": still has %lu pages remaining\n",
+ PFID(lu_object_fid(&obj->co_lu)),
+ inode->i_mapping->nrpages);
+ RETURN(-EIO);
+ }
+
RETURN(0);
}
RETURN(0);
}
@@
-175,9
+185,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,24
+205,25
@@
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);
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;
+ if (attr->cra_type == CRT_WRITE) {
+ valid_flags |= OBD_MD_FLMTIME | OBD_MD_FLCTIME;
+ obdo_set_o_projid(oa, ll_i2info(inode)->lli_projid);
+ }
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,