LU-2675 lustre: remove linux/lustre_lib.h

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

diff --git a/lustre/llite/file.c b/lustre/llite/file.c
index 19948f7..7c00ed5 100644 (file)
--- a/lustre/llite/file.c
+++ b/lustre/llite/file.c
@@ -1036,7 +1036,12 @@ int ll_merge_lvb(const struct lu_env *env, struct inode *inode)
        LTIME_S(inode->i_atime) = lli->lli_lvb.lvb_atime;
        LTIME_S(inode->i_mtime) = lli->lli_lvb.lvb_mtime;
        LTIME_S(inode->i_ctime) = lli->lli_lvb.lvb_ctime;
-       inode_init_lvb(inode, &lvb);
+
+       lvb.lvb_size = i_size_read(inode);
+       lvb.lvb_blocks = inode->i_blocks;
+       lvb.lvb_mtime = LTIME_S(inode->i_mtime);
+       lvb.lvb_atime = LTIME_S(inode->i_atime);
+       lvb.lvb_ctime = LTIME_S(inode->i_ctime);
 
        cl_object_attr_lock(obj);
        rc = cl_object_attr_get(env, obj, attr);