LU-5971 llite: reorganize variable and data structures

[fs/lustre-release.git] / lustre / llite / glimpse.c

diff --git a/lustre/llite/glimpse.c b/lustre/llite/glimpse.c
index 539cf1c..5966d58 100644 (file)
--- a/lustre/llite/glimpse.c
+++ b/lustre/llite/glimpse.c
@@ -52,6 +52,7 @@
 
 #include "cl_object.h"
 #include "llite_internal.h"
+#include "vvp_internal.h"
 
 static const struct cl_lock_descr whole_file = {
         .cld_start = 0,
@@ -93,7 +94,7 @@ int cl_glimpse_lock(const struct lu_env *env, struct cl_io *io,
 
        CDEBUG(D_DLMTRACE, "Glimpsing inode "DFID"\n", PFID(fid));
        if (lli->lli_has_smd) {
-               struct cl_lock *lock = ccc_env_lock(env);
+               struct cl_lock *lock = vvp_env_lock(env);
                struct cl_lock_descr *descr = &lock->cll_descr;
 
                /* NOTE: this looks like DLM lock request, but it may
@@ -161,7 +162,7 @@ static int cl_io_get(struct inode *inode, struct lu_env **envout,
        if (S_ISREG(inode->i_mode)) {
                 env = cl_env_get(refcheck);
                 if (!IS_ERR(env)) {
-                        io = ccc_env_thread_io(env);
+                       io = vvp_env_thread_io(env);
                         io->ci_obj = clob;
                         *envout = env;
                         *ioout  = io;
@@ -238,7 +239,7 @@ int cl_local_size(struct inode *inode)
         if (result > 0)
                 result = io->ci_result;
        else if (result == 0) {
-               struct cl_lock *lock = ccc_env_lock(env);
+               struct cl_lock *lock = vvp_env_lock(env);
 
                lock->cll_descr = whole_file;
                lock->cll_descr.cld_enq_flags = CEF_PEEK;