Merge "LU-9771 flr: Merge branch 'flr'"

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

diff --git a/lustre/llite/lcommon_cl.c b/lustre/llite/lcommon_cl.c
index 94fda5a..757b336 100644 (file)
--- a/lustre/llite/lcommon_cl.c
+++ b/lustre/llite/lcommon_cl.c
@@ -15,11 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
@@ -27,7 +23,7 @@
  * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2015, Intel Corporation.
+ * Copyright (c) 2011, 2016, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -51,7 +47,6 @@
 #include <obd_support.h>
 #include <lustre_fid.h>
 #include <lustre_dlm.h>
-#include <lustre_ver.h>
 #include <lustre_mdc.h>
 #include <cl_object.h>
 
@@ -99,6 +94,9 @@ int cl_setattr_ost(struct cl_object *obj, const struct iattr *attr,
        io->u.ci_setattr.sa_parent_fid = lu_object_fid(&obj->co_lu);
 
 again:
+       if (attr->ia_valid & ATTR_FILE)
+               ll_io_set_mirror(io, attr->ia_file);
+
         if (cl_io_init(env, io, CIT_SETATTR, io->ci_obj) == 0) {
                struct vvp_io *vio = vvp_env_io(env);
 
@@ -176,6 +174,10 @@ int cl_file_inode_init(struct inode *inode, struct lustre_md *md)
                         result = PTR_ERR(clob);
        } else {
                result = cl_conf_set(env, lli->lli_clob, &conf);
+               if (result == -EBUSY) {
+                       /* ignore the error since I/O will handle it later */
+                       result = 0;
+               }
        }
 
         cl_env_put(env, &refcheck);
@@ -257,28 +259,28 @@ void cl_inode_fini(struct inode *inode)
 }
 
 /**
- * build inode number from passed @fid */
+ * build inode number from passed @fid.
+ *
+ * For 32-bit systems or syscalls limit the inode number to a 32-bit value
+ * to avoid EOVERFLOW errors.  This will inevitably result in inode number
+ * collisions, but fid_flatten32() tries hard to avoid this if possible.
+ */
 __u64 cl_fid_build_ino(const struct lu_fid *fid, int api32)
 {
-        if (BITS_PER_LONG == 32 || api32)
-                RETURN(fid_flatten32(fid));
-        else
-                RETURN(fid_flatten(fid));
+       if (BITS_PER_LONG == 32 || api32)
+               RETURN(fid_flatten32(fid));
+
+       RETURN(fid_flatten(fid));
 }
 
 /**
  * build inode generation from passed @fid.  If our FID overflows the 32-bit
- * inode number then return a non-zero generation to distinguish them. */
+ * inode number then return a non-zero generation to distinguish them.
+ */
 __u32 cl_fid_build_gen(const struct lu_fid *fid)
 {
-        __u32 gen;
-        ENTRY;
-
-        if (fid_is_igif(fid)) {
-                gen = lu_igif_gen(fid);
-                RETURN(gen);
-        }
+       if (fid_is_igif(fid))
+               RETURN(lu_igif_gen(fid));
 
-        gen = (fid_flatten(fid) >> 32);
-        RETURN(gen);
+       RETURN(fid_flatten(fid) >> 32);
 }