LU-1346 libcfs: replace cfs_ memory wrappers

[fs/lustre-release.git] / lustre / include / obd.h

diff --git a/lustre/include/obd.h b/lustre/include/obd.h
index 7e866e9..9747623 100644 (file)
--- a/lustre/include/obd.h
+++ b/lustre/include/obd.h
@@ -216,32 +216,32 @@ static inline int lov_lum_lsm_cmp(struct lov_user_md *lum,
 }
 
 static inline int lov_lum_swab_if_needed(struct lov_user_md_v3 *lumv3,
-                                         int *lmm_magic,
-                                         struct lov_user_md *lum)
+                                        int *lmm_magic,
+                                        struct lov_user_md *lum)
 {
-        if (lum && cfs_copy_from_user(lumv3, lum,sizeof(struct lov_user_md_v1)))
-                return -EFAULT;
-
-        *lmm_magic = lumv3->lmm_magic;
-
-        if (*lmm_magic == __swab32(LOV_USER_MAGIC_V1)) {
-                lustre_swab_lov_user_md_v1((struct lov_user_md_v1 *)lumv3);
-                *lmm_magic = LOV_USER_MAGIC_V1;
-        } else if (*lmm_magic == LOV_USER_MAGIC_V3) {
-                if (lum && cfs_copy_from_user(lumv3, lum, sizeof(*lumv3)))
-                        return -EFAULT;
-        } else if (*lmm_magic == __swab32(LOV_USER_MAGIC_V3)) {
-                if (lum && cfs_copy_from_user(lumv3, lum, sizeof(*lumv3)))
-                        return -EFAULT;
-                lustre_swab_lov_user_md_v3(lumv3);
-                *lmm_magic = LOV_USER_MAGIC_V3;
-        } else if (*lmm_magic != LOV_USER_MAGIC_V1) {
-                CDEBUG(D_IOCTL,
-                       "bad userland LOV MAGIC: %#08x != %#08x nor %#08x\n",
-                       *lmm_magic, LOV_USER_MAGIC_V1, LOV_USER_MAGIC_V3);
-                       return -EINVAL;
-        }
-        return 0;
+       if (lum && copy_from_user(lumv3, lum, sizeof(struct lov_user_md_v1)))
+               return -EFAULT;
+
+       *lmm_magic = lumv3->lmm_magic;
+
+       if (*lmm_magic == __swab32(LOV_USER_MAGIC_V1)) {
+               lustre_swab_lov_user_md_v1((struct lov_user_md_v1 *)lumv3);
+               *lmm_magic = LOV_USER_MAGIC_V1;
+       } else if (*lmm_magic == LOV_USER_MAGIC_V3) {
+               if (lum && copy_from_user(lumv3, lum, sizeof(*lumv3)))
+                       return -EFAULT;
+       } else if (*lmm_magic == __swab32(LOV_USER_MAGIC_V3)) {
+               if (lum && copy_from_user(lumv3, lum, sizeof(*lumv3)))
+                       return -EFAULT;
+               lustre_swab_lov_user_md_v3(lumv3);
+               *lmm_magic = LOV_USER_MAGIC_V3;
+       } else if (*lmm_magic != LOV_USER_MAGIC_V1) {
+               CDEBUG(D_IOCTL,
+                      "bad userland LOV MAGIC: %#08x != %#08x nor %#08x\n",
+                      *lmm_magic, LOV_USER_MAGIC_V1, LOV_USER_MAGIC_V3);
+                      return -EINVAL;
+       }
+       return 0;
 }
 
 void lov_stripe_lock(struct lov_stripe_md *md);
@@ -259,10 +259,10 @@ struct obd_type {
 };
 
 struct brw_page {
-        obd_off  off;
-        cfs_page_t *pg;
-        int count;
-        obd_flag flag;
+       obd_off  off;
+       struct page *pg;
+       int count;
+       obd_flag flag;
 };
 
 /* Individual type definitions */
@@ -462,7 +462,7 @@ struct client_obd {
        int                  cl_grant_shrink_interval; /* seconds */
 
        /* A chunk is an optimal size used by osc_extent to determine
-        * the extent size. A chunk is max(CFS_PAGE_SIZE, OST block size) */
+        * the extent size. A chunk is max(PAGE_CACHE_SIZE, OST block size) */
        int                  cl_chunkbits;
        int                  cl_chunk;
        int                  cl_extent_tax; /* extent overhead, by bytes */
@@ -757,7 +757,7 @@ struct niobuf_local {
        __u32           lnb_page_offset;
        __u32           len;
        __u32           flags;
-       cfs_page_t      *page;
+       struct page     *page;
        struct dentry   *dentry;
        int             lnb_grant_used;
        int             rc;
@@ -1702,7 +1702,7 @@ bad_format:
 static inline int cli_brw_size(struct obd_device *obd)
 {
        LASSERT(obd != NULL);
-       return obd->u.cli.cl_max_pages_per_rpc << CFS_PAGE_SHIFT;
+       return obd->u.cli.cl_max_pages_per_rpc << PAGE_CACHE_SHIFT;
 }
 
 #endif /* __OBD_H */