LU-6201 llite: remove duplicate fiemap defines

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

diff --git a/lustre/osd-ldiskfs/osd_io.c b/lustre/osd-ldiskfs/osd_io.c
index a29c7bb..8c32812 100644 (file)
--- a/lustre/osd-ldiskfs/osd_io.c
+++ b/lustre/osd-ldiskfs/osd_io.c
@@ -505,7 +505,7 @@ static int osd_bufs_put(const struct lu_env *env, struct dt_object *dt,
  */
 static int osd_bufs_get(const struct lu_env *env, struct dt_object *dt,
                        loff_t pos, ssize_t len, struct niobuf_local *lnb,
-                       int rw, struct lustre_capa *capa)
+                       int rw)
 {
        struct osd_object   *obj    = osd_dt_obj(dt);
        int npages, i, rc = 0;
@@ -1025,7 +1025,7 @@ static int osd_write_prep(const struct lu_env *env, struct dt_object *dt,
                        if (off)
                                memset(p, 0, off);
                        off = (lnb[i].lnb_page_offset + lnb[i].lnb_len) &
-                             ~CFS_PAGE_MASK;
+                             ~PAGE_MASK;
                        if (off)
                                memset(p + off, 0, PAGE_CACHE_SIZE - off);
                        kunmap(lnb[i].lnb_page);
@@ -1430,15 +1430,11 @@ int osd_ldiskfs_read(struct inode *inode, void *buf, int size, loff_t *offs)
 }
 
 static ssize_t osd_read(const struct lu_env *env, struct dt_object *dt,
-                        struct lu_buf *buf, loff_t *pos,
-                        struct lustre_capa *capa)
+                       struct lu_buf *buf, loff_t *pos)
 {
         struct inode *inode = osd_dt_obj(dt)->oo_inode;
         int           rc;
 
-        if (osd_object_auth(env, dt, capa, CAPA_OPC_BODY_READ))
-                RETURN(-EACCES);
-
         /* Read small symlink from inode body as we need to maintain correct
          * on-disk symlinks for ldiskfs.
          */
@@ -1457,7 +1453,8 @@ static inline int osd_extents_enabled(struct super_block *sb,
        if (inode != NULL) {
                if (LDISKFS_I(inode)->i_flags & LDISKFS_EXTENTS_FL)
                        return 1;
-       } else if (test_opt(sb, EXTENTS)) {
+       } else if (LDISKFS_HAS_INCOMPAT_FEATURE(sb,
+                               LDISKFS_FEATURE_INCOMPAT_EXTENTS)) {
                return 1;
        }
        return 0;
@@ -1693,9 +1690,8 @@ int osd_ldiskfs_write_record(struct inode *inode, void *buf, int bufsize,
 }
 
 static ssize_t osd_write(const struct lu_env *env, struct dt_object *dt,
-                         const struct lu_buf *buf, loff_t *pos,
-                         struct thandle *handle, struct lustre_capa *capa,
-                         int ignore_quota)
+                        const struct lu_buf *buf, loff_t *pos,
+                        struct thandle *handle, int ignore_quota)
 {
        struct inode            *inode = osd_dt_obj(dt)->oo_inode;
        struct osd_thandle      *oh;
@@ -1704,9 +1700,6 @@ static ssize_t osd_write(const struct lu_env *env, struct dt_object *dt,
 
         LASSERT(dt_object_exists(dt));
 
-        if (osd_object_auth(env, dt, capa, CAPA_OPC_BODY_WRITE))
-                return -EACCES;
-
         LASSERT(handle != NULL);
        LASSERT(inode != NULL);
        ll_vfs_dq_init(inode);
@@ -1764,8 +1757,7 @@ static int osd_declare_punch(const struct lu_env *env, struct dt_object *dt,
 }
 
 static int osd_punch(const struct lu_env *env, struct dt_object *dt,
-                    __u64 start, __u64 end, struct thandle *th,
-                    struct lustre_capa *capa)
+                    __u64 start, __u64 end, struct thandle *th)
 {
        struct osd_thandle *oh;
        struct osd_object  *obj = osd_dt_obj(dt);
@@ -1802,7 +1794,7 @@ static int osd_punch(const struct lu_env *env, struct dt_object *dt,
         * For a partial-page truncate, flush the page to disk immediately to
         * avoid data corruption during direct disk write.  b=17397
         */
-       if ((start & ~CFS_PAGE_MASK) != 0)
+       if ((start & ~PAGE_MASK) != 0)
                 rc = filemap_fdatawrite_range(inode->i_mapping, start, start+1);
 
         h = journal_current_handle();
@@ -1855,7 +1847,7 @@ static int fiemap_check_ranges(struct inode *inode,
 #define FIEMAP_MAX_EXTENTS     (UINT_MAX / sizeof(struct fiemap_extent))
 
 static int osd_fiemap_get(const struct lu_env *env, struct dt_object *dt,
-                          struct ll_user_fiemap *fm)
+                         struct fiemap *fm)
 {
        struct fiemap_extent_info fieinfo = {0, };
        struct inode *inode = osd_dt_obj(dt)->oo_inode;