staging/lustre: remove the second argument of ll_kmap_atomic()

kmap_atomic allows only one argument now, just remove the second.

Signed-off-by: Zhao Hongjiang <zhaohongjiang@huawei.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/lustre/lustre/include/linux/lustre_compat25.h b/drivers/staging/lustre/lustre/include/linux/lustre_compat25.h
index dff04688945b6278c581e0129fc1367a9e9976ba..426533b5d1352bb0bf6a19858ec4a8877d8a0609 100644 (file)
--- a/drivers/staging/lustre/lustre/include/linux/lustre_compat25.h
+++ b/drivers/staging/lustre/lustre/include/linux/lustre_compat25.h
@@ -266,9 +266,6 @@ static inline int ll_quota_off(struct super_block *sb, int off, int remount)
 #define queue_max_phys_segments(rq)       queue_max_segments(rq)
 #define queue_max_hw_segments(rq)       queue_max_segments(rq)
 
-#define ll_kmap_atomic(a, b)   kmap_atomic(a)
-#define ll_kunmap_atomic(a, b) kunmap_atomic(a)
-
 
 #define ll_d_hlist_node hlist_node
 #define ll_d_hlist_empty(list) hlist_empty(list)

diff --git a/drivers/staging/lustre/lustre/llite/rw26.c b/drivers/staging/lustre/lustre/llite/rw26.c
index f1a1c5f40a1d4ac4e1a555042177473cc3fa58ce..97088e6ddea07ae4cfc3baec412bce1751bb648b 100644 (file)
--- a/drivers/staging/lustre/lustre/llite/rw26.c
+++ b/drivers/staging/lustre/lustre/llite/rw26.c
@@ -287,11 +287,11 @@ ssize_t ll_direct_rw_pages(const struct lu_env *env, struct cl_io *io,
                        src_page = (rw == WRITE) ? pages[i] : vmpage;
                        dst_page = (rw == WRITE) ? vmpage : pages[i];
 
-                       src = ll_kmap_atomic(src_page, KM_USER0);
-                       dst = ll_kmap_atomic(dst_page, KM_USER1);
+                       src = kmap_atomic(src_page);
+                       dst = kmap_atomic(dst_page);
                        memcpy(dst, src, min(page_size, size));
-                       ll_kunmap_atomic(dst, KM_USER1);
-                       ll_kunmap_atomic(src, KM_USER0);
+                       kunmap_atomic(dst);
+                       kunmap_atomic(src);
 
                        /* make sure page will be added to the transfer by
                         * cl_io_submit()->...->vvp_page_prep_write(). */

diff --git a/drivers/staging/lustre/lustre/llite/vvp_io.c b/drivers/staging/lustre/lustre/llite/vvp_io.c
index eb964acad45c38127c093b3f8266ae16d629aca2..bbd6351e1f556095152b9abc94c98a48adb7c957 100644 (file)
--- a/drivers/staging/lustre/lustre/llite/vvp_io.c
+++ b/drivers/staging/lustre/lustre/llite/vvp_io.c
@@ -887,10 +887,10 @@ static int vvp_io_prepare_partial(const struct lu_env *env, struct cl_io *io,
                 * purposes here we can treat it like i_size.
                 */
                if (attr->cat_kms <= offset) {
-                       char *kaddr = ll_kmap_atomic(cp->cpg_page, KM_USER0);
+                       char *kaddr = kmap_atomic(cp->cpg_page);
 
                        memset(kaddr, 0, cl_page_size(obj));
-                       ll_kunmap_atomic(kaddr, KM_USER0);
+                       kunmap_atomic(kaddr);
                } else if (cp->cpg_defer_uptodate)
                        cp->cpg_ra_used = 1;
                else