LU-2675 llite: remove lli_lvb

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

diff --git a/lustre/llite/glimpse.c b/lustre/llite/glimpse.c
index 38559b8..0ebf4cd 100644 (file)
--- a/lustre/llite/glimpse.c
+++ b/lustre/llite/glimpse.c
@@ -129,7 +129,7 @@ int cl_glimpse_lock(const struct lu_env *env, struct cl_io *io,
                                RETURN(result);
 
                        if (!agl) {
                                RETURN(result);
 
                        if (!agl) {

-                               cl_merge_lvb(env, inode);
+                               ll_merge_attr(env, inode);

                                if (cl_isize_read(inode) > 0 &&
                                    inode->i_blocks == 0) {
                                        /*
                                if (cl_isize_read(inode) > 0 &&
                                    inode->i_blocks == 0) {
                                        /*


@@ -144,7 +144,7 @@ int cl_glimpse_lock(const struct lu_env *env, struct cl_io *io,
                        cl_lock_release(env, lock);
                } else {
                        CDEBUG(D_DLMTRACE, "No objects for inode\n");
                        cl_lock_release(env, lock);
                } else {
                        CDEBUG(D_DLMTRACE, "No objects for inode\n");

-                       cl_merge_lvb(env, inode);
+                       ll_merge_attr(env, inode);

                }
        }
 
                }
        }
 


@@ -247,7 +247,7 @@ int cl_local_size(struct inode *inode)
                lock->cll_descr.cld_obj = clob;
                result = cl_lock_request(env, io, lock);
                if (result == 0) {
                lock->cll_descr.cld_obj = clob;
                result = cl_lock_request(env, io, lock);
                if (result == 0) {

-                       cl_merge_lvb(env, inode);
+                       ll_merge_attr(env, inode);

                        cl_lock_release(env, lock);
                }
        }
                        cl_lock_release(env, lock);
                }
        }