LU-3185 build: fix autogen with modern autoconf tools

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

diff --git a/lustre/lclient/glimpse.c b/lustre/lclient/glimpse.c
index 58aad5e..94b2696 100644 (file)
--- a/lustre/lclient/glimpse.c
+++ b/lustre/lclient/glimpse.c
@@ -27,7 +27,7 @@
  * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2012, Whamcloud, Inc.
+ * Copyright (c) 2011, 2013, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -157,7 +157,7 @@ int cl_glimpse_lock(const struct lu_env *env, struct cl_io *io,
                         LASSERT(agl == 0);
                         result = cl_wait(env, lock);
                         if (result == 0) {
-                                cl_merge_lvb(inode);
+                               cl_merge_lvb(env, inode);
                                 if (cl_isize_read(inode) > 0 &&
                                     inode->i_blocks == 0) {
                                         /*
@@ -173,7 +173,7 @@ int cl_glimpse_lock(const struct lu_env *env, struct cl_io *io,
                         cl_lock_release(env, lock, "glimpse", cfs_current());
                 } else {
                         CDEBUG(D_DLMTRACE, "No objects for inode\n");
-                       cl_merge_lvb(inode);
+                       cl_merge_lvb(env, inode);
                 }
         }
 
@@ -237,6 +237,8 @@ int cl_glimpse_size0(struct inode *inode, int agl)
                 else if (result == 0)
                         result = cl_glimpse_lock(env, io, inode, io->ci_obj,
                                                  agl);
+
+               OBD_FAIL_TIMEOUT(OBD_FAIL_GLIMPSE_DELAY, 2);
                 cl_io_fini(env, io);
                if (unlikely(io->ci_need_restart))
                        goto again;
@@ -277,7 +279,7 @@ int cl_local_size(struct inode *inode)
                 descr->cld_obj = clob;
                 lock = cl_lock_peek(env, io, descr, "localsize", cfs_current());
                 if (lock != NULL) {
-                        cl_merge_lvb(inode);
+                       cl_merge_lvb(env, inode);
                         cl_unuse(env, lock);
                         cl_lock_release(env, lock, "localsize", cfs_current());
                         result = 0;