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-13826 utils: fix compatibility for LL_IOC_MDC_GETINFO
[fs/lustre-release.git]
/
lustre
/
llite
/
vvp_object.c
diff --git
a/lustre/llite/vvp_object.c
b/lustre/llite/vvp_object.c
index
4038741
..
fdff422
100644
(file)
--- a/
lustre/llite/vvp_object.c
+++ b/
lustre/llite/vvp_object.c
@@
-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>
@@
-151,6
+150,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;
}
@@
-185,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
@@
-213,6
+213,8
@@
static void vvp_req_attr_set(const struct lu_env *env, struct cl_object *obj,
if (attr->cra_type == CRT_WRITE) {
valid_flags |= OBD_MD_FLMTIME | OBD_MD_FLCTIME;
obdo_set_o_projid(oa, ll_i2info(inode)->lli_projid);
if (attr->cra_type == CRT_WRITE) {
valid_flags |= OBD_MD_FLMTIME | OBD_MD_FLCTIME;
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);
}
obdo_from_inode(oa, inode, valid_flags & attr->cra_flags);
obdo_set_parent_fid(oa, &ll_i2info(inode)->lli_fid);
@@
-266,13
+268,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 = {