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-9727 lustre: add uid/gid to Changelogs entries
[fs/lustre-release.git]
/
lustre
/
llite
/
vvp_object.c
diff --git
a/lustre/llite/vvp_object.c
b/lustre/llite/vvp_object.c
index
30dd2c7
..
6ca4212
100644
(file)
--- a/
lustre/llite/vvp_object.c
+++ b/
lustre/llite/vvp_object.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
*
* 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
*/
*
* GPL HEADER END
*/
@@
-27,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
4
, Intel Corporation.
+ * Copyright (c) 2012, 201
5
, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
*/
/*
* This file is part of Lustre, http://www.lustre.org/
@@
-98,12
+94,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 */
}
@@
-118,15
+115,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;
}
@@
-170,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);
}
@@
-204,9
+210,11
@@
static void vvp_req_attr_set(const struct lu_env *env, struct cl_object *obj,
oa = attr->cra_oa;
inode = vvp_object_inode(obj);
oa = attr->cra_oa;
inode = vvp_object_inode(obj);
- if (attr->cra_type == CRT_WRITE)
+ 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 |
OBD_MD_FLUID | OBD_MD_FLGID;
+ 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))
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))