X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=lustre%2Flclient%2Fglimpse.c;h=0169cdfa3b2de7ab835244aab7eb265eb7aa10e5;hb=refs%2Fchanges%2F56%2F6956%2F8;hp=4783b68e99e6f64aa116c88e330df582f29e1cff;hpb=e3a7c58aebafce40323db54bf6056029e5af4a70;p=fs%2Flustre-release.git

diff --git a/lustre/lclient/glimpse.c b/lustre/lclient/glimpse.c
index 4783b68..0169cdf 100644
--- 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/
@@ -115,7 +115,7 @@ int cl_glimpse_lock(const struct lu_env *env, struct cl_io *io,
         result = 0;
         if (!(lli->lli_flags & LLIF_MDS_SIZE_LOCK)) {
                 CDEBUG(D_DLMTRACE, "Glimpsing inode "DFID"\n", PFID(fid));
-                if (lli->lli_smd) {
+		if (lli->lli_has_smd) {
                         /* NOTE: this looks like DLM lock request, but it may
                          *       not be one. Due to CEF_ASYNC flag (translated
                          *       to LDLM_FL_HAS_INTENT by osc), this is
@@ -136,47 +136,48 @@ int cl_glimpse_lock(const struct lu_env *env, struct cl_io *io,
                         if (agl)
                                 descr->cld_enq_flags |= CEF_AGL;
                         cio->cui_glimpse = 1;
-                        /*
-                         * CEF_ASYNC is used because glimpse sub-locks cannot
-                         * deadlock (because they never conflict with other
-                         * locks) and, hence, can be enqueued out-of-order.
-                         *
-                         * CEF_MUST protects glimpse lock from conversion into
-                         * a lockless mode.
-                         */
-                        lock = cl_lock_request(env, io, descr, "glimpse",
-                                               cfs_current());
-                        cio->cui_glimpse = 0;
+			/*
+			 * CEF_ASYNC is used because glimpse sub-locks cannot
+			 * deadlock (because they never conflict with other
+			 * locks) and, hence, can be enqueued out-of-order.
+			 *
+			 * CEF_MUST protects glimpse lock from conversion into
+			 * a lockless mode.
+			 */
+			lock = cl_lock_request(env, io, descr, "glimpse",
+					       current);
+			cio->cui_glimpse = 0;
 
-                        if (lock == NULL)
-                                RETURN(0);
+			if (lock == NULL)
+				RETURN(0);
 
-                        if (IS_ERR(lock))
-                                RETURN(PTR_ERR(lock));
+			if (IS_ERR(lock))
+				RETURN(PTR_ERR(lock));
 
-                        LASSERT(agl == 0);
-                        result = cl_wait(env, lock);
-                        if (result == 0) {
-                                cl_merge_lvb(inode);
-                                if (cl_isize_read(inode) > 0 &&
-                                    inode->i_blocks == 0) {
-                                        /*
-                                         * LU-417: Add dirty pages block count
-                                         * lest i_blocks reports 0, some "cp" or
-                                         * "tar" may think it's a completely
-                                         * sparse file and skip it.
-                                         */
-                                        inode->i_blocks = dirty_cnt(inode);
-                                }
-                                cl_unuse(env, lock);
-                        }
-                        cl_lock_release(env, lock, "glimpse", cfs_current());
-                } else {
-                        CDEBUG(D_DLMTRACE, "No objects for inode\n");
-                }
-        }
+			LASSERT(agl == 0);
+			result = cl_wait(env, lock);
+			if (result == 0) {
+				cl_merge_lvb(env, inode);
+				if (cl_isize_read(inode) > 0 &&
+				    inode->i_blocks == 0) {
+					/*
+					 * LU-417: Add dirty pages block count
+					 * lest i_blocks reports 0, some "cp" or
+					 * "tar" may think it's a completely
+					 * sparse file and skip it.
+					 */
+					inode->i_blocks = dirty_cnt(inode);
+				}
+				cl_unuse(env, lock);
+			}
+			cl_lock_release(env, lock, "glimpse", current);
+		} else {
+			CDEBUG(D_DLMTRACE, "No objects for inode\n");
+			cl_merge_lvb(env, inode);
+		}
+	}
 
-        RETURN(result);
+	RETURN(result);
 }
 
 static int cl_io_get(struct inode *inode, struct lu_env **envout,
@@ -224,6 +225,8 @@ int cl_glimpse_size0(struct inode *inode, int agl)
 
         result = cl_io_get(inode, &env, &io, &refcheck);
         if (result > 0) {
+	again:
+		io->ci_verify_layout = 1;
                 result = cl_io_init(env, io, CIT_MISC, io->ci_obj);
                 if (result > 0)
                         /*
@@ -234,10 +237,14 @@ 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);
-                cl_env_put(env, &refcheck);
-        }
-        RETURN(result);
+		if (unlikely(io->ci_need_restart))
+			goto again;
+		cl_env_put(env, &refcheck);
+	}
+	RETURN(result);
 }
 
 int cl_local_size(struct inode *inode)
@@ -253,7 +260,7 @@ int cl_local_size(struct inode *inode)
 
         ENTRY;
 
-        if (!cl_i2info(inode)->lli_smd)
+	if (!cl_i2info(inode)->lli_has_smd)
                 RETURN(0);
 
         result = cl_io_get(inode, &env, &io, &refcheck);
@@ -264,23 +271,23 @@ int cl_local_size(struct inode *inode)
         result = cl_io_init(env, io, CIT_MISC, clob);
         if (result > 0)
                 result = io->ci_result;
-        else if (result == 0) {
-                cti = ccc_env_info(env);
-                descr = &cti->cti_descr;
+	else if (result == 0) {
+		cti = ccc_env_info(env);
+		descr = &cti->cti_descr;
 
-                *descr = whole_file;
-                descr->cld_obj = clob;
-                lock = cl_lock_peek(env, io, descr, "localsize", cfs_current());
-                if (lock != NULL) {
-                        cl_merge_lvb(inode);
-                        cl_unuse(env, lock);
-                        cl_lock_release(env, lock, "localsize", cfs_current());
-                        result = 0;
-                } else
-                        result = -ENODATA;
-        }
-        cl_io_fini(env, io);
-        cl_env_put(env, &refcheck);
-        RETURN(result);
+		*descr = whole_file;
+		descr->cld_obj = clob;
+		lock = cl_lock_peek(env, io, descr, "localsize", current);
+		if (lock != NULL) {
+			cl_merge_lvb(env, inode);
+			cl_unuse(env, lock);
+			cl_lock_release(env, lock, "localsize", current);
+			result = 0;
+		} else
+			result = -ENODATA;
+	}
+	cl_io_fini(env, io);
+	cl_env_put(env, &refcheck);
+	RETURN(result);
 }