LU-6142 libcfs: discard PO2_ROUNDUP_TYPED, LOWEST_BIT_SET

[fs/lustre-release.git] / lustre / osd-zfs / osd_io.c

diff --git a/lustre/osd-zfs/osd_io.c b/lustre/osd-zfs/osd_io.c
index 1f71bd9..dd26c0a 100644 (file)
--- a/lustre/osd-zfs/osd_io.c
+++ b/lustre/osd-zfs/osd_io.c
@@ -614,11 +614,9 @@ static inline uint64_t osd_roundup2blocksz(uint64_t size,
        size += offset % blksz;
 
        if (likely(is_power_of_2(blksz)))
-               return PO2_ROUNDUP_TYPED(size, blksz, uint64_t);
-
-       size += blksz - 1;
-       do_div(size, blksz);
-       return size * blksz;
+               return round_up(size, blksz);
+       else
+               return DIV_ROUND_UP_ULL(size, blksz) * blksz;
 }
 
 static int osd_declare_write_commit(const struct lu_env *env,
@@ -1166,7 +1164,8 @@ static int osd_fallocate(const struct lu_env *env, struct dt_object *dt,
 }
 
 static int osd_declare_fallocate(const struct lu_env *env,
-                                struct dt_object *dt, struct thandle *th)
+                                struct dt_object *dt, __u64 start, __u64 end,
+                                int mode, struct thandle *th)
 {
        int rc = -EOPNOTSUPP;
        ENTRY;
@@ -1191,33 +1190,31 @@ static loff_t osd_lseek(const struct lu_env *env, struct dt_object *dt,
 
        LASSERT(dt_object_exists(dt));
        LASSERT(osd_invariant(obj));
+       LASSERT(offset >= 0);
 
-       if (offset < 0 || offset >= size)
-               RETURN(-ENXIO);
+       /* for SEEK_HOLE treat 'offset' beyond the end of file as in real
+        * hole. LOV to decide after all if that real hole or not.
+        */
+       if (offset >= size)
+               RETURN(hole ? offset : -ENXIO);
 
-#ifdef HAVE_DMU_OFFSET_NEXT
-       rc = dmu_offset_next(osd_obj2dev(obj)->od_os, obj->oo_dn->dn_object,
-                            hole, &result);
+       rc = osd_dmu_offset_next(osd_obj2dev(obj)->od_os,
+                                obj->oo_dn->dn_object, hole, &result);
        if (rc == ESRCH)
                RETURN(-ENXIO);
-#else
-       /*
-        * In absence of dmu_offset_next() just do nothing but
-        * return EBUSY as does dmu_offset_next() and that means
-        * generic approach should be used.
+
+       /* file was dirty, so fall back to using generic logic:
+        * For HOLE return file size, for DATA the result is set
+        * already to the 'offset' parameter value.
         */
-       rc = EBUSY;
-#endif
-       /* file was dirty, so fall back to using generic logic */
        if (rc == EBUSY && hole)
-               RETURN(-ENXIO); /* see comment below */
+               result = size;
 
-       /* when result is out of file range then it must be virtual hole
-        * at the end of file, but this is not real file end, so return
-        * just -ENXIO and LOV will translate it properly.
+       /* dmu_offset_next() only works on whole blocks so may return SEEK_HOLE
+        * result as end of the last block instead of logical EOF which we need
         */
-       if (result >= size)
-               RETURN(-ENXIO);
+       if (result > size)
+               result = size;
 
        RETURN(result);
 }