LU-6201 llite: remove duplicate fiemap defines

[fs/lustre-release.git] / lustre / ofd / ofd_obd.c

diff --git a/lustre/ofd/ofd_obd.c b/lustre/ofd/ofd_obd.c
index 6de500c..ff047ca 100644 (file)
--- a/lustre/ofd/ofd_obd.c
+++ b/lustre/ofd/ofd_obd.c
@@ -638,7 +638,7 @@ static int ofd_get_info(const struct lu_env *env, struct obd_export *exp,
        struct ofd_thread_info          *info;
        struct ofd_device               *ofd;
        struct ll_fiemap_info_key       *fm_key = key;
        struct ofd_thread_info          *info;
        struct ofd_device               *ofd;
        struct ll_fiemap_info_key       *fm_key = key;

-       struct ll_user_fiemap           *fiemap = val;
+       struct fiemap                   *fiemap = val;

        int                              rc = 0;
 
        ENTRY;
        int                              rc = 0;
 
        ENTRY;


@@ -653,7 +653,7 @@ static int ofd_get_info(const struct lu_env *env, struct obd_export *exp,
        if (KEY_IS(KEY_FIEMAP)) {
                info = ofd_info_init(env, exp);
 
        if (KEY_IS(KEY_FIEMAP)) {
                info = ofd_info_init(env, exp);
 

-               rc = ostid_to_fid(&info->fti_fid, &fm_key->oa.o_oi,
+               rc = ostid_to_fid(&info->fti_fid, &fm_key->lfik_oa.o_oi,

                                  ofd->ofd_lut.lut_lsd.lsd_osd_index);
                if (rc != 0)
                        RETURN(rc);
                                  ofd->ofd_lut.lut_lsd.lsd_osd_index);
                if (rc != 0)
                        RETURN(rc);