gfs2: remove the second argument of k[un]map_atomic()

diff --git a/fs/gfs2/aops.c b/fs/gfs2/aops.c
index 4858e1fed8b1e7c17777062c07b10d2666e562e9..6cd6761517cd218e302eb1bad388f68d01eba18a 100644 (file)
--- a/fs/gfs2/aops.c
+++ b/fs/gfs2/aops.c
@@ -434,12 +434,12 @@ static int stuffed_readpage(struct gfs2_inode *ip, struct page *page)
        if (error)
                return error;
 
-       kaddr = kmap_atomic(page, KM_USER0);
+       kaddr = kmap_atomic(page);
        if (dsize > (dibh->b_size - sizeof(struct gfs2_dinode)))
                dsize = (dibh->b_size - sizeof(struct gfs2_dinode));
        memcpy(kaddr, dibh->b_data + sizeof(struct gfs2_dinode), dsize);
        memset(kaddr + dsize, 0, PAGE_CACHE_SIZE - dsize);
-       kunmap_atomic(kaddr, KM_USER0);
+       kunmap_atomic(kaddr);
        flush_dcache_page(page);
        brelse(dibh);
        SetPageUptodate(page);
@@ -542,9 +542,9 @@ int gfs2_internal_read(struct gfs2_inode *ip, struct file_ra_state *ra_state,
                page = read_cache_page(mapping, index, __gfs2_readpage, NULL);
                if (IS_ERR(page))
                        return PTR_ERR(page);
-               p = kmap_atomic(page, KM_USER0);
+               p = kmap_atomic(page);
                memcpy(buf + copied, p + offset, amt);
-               kunmap_atomic(p, KM_USER0);
+               kunmap_atomic(p);
                mark_page_accessed(page);
                page_cache_release(page);
                copied += amt;
@@ -789,11 +789,11 @@ static int gfs2_stuffed_write_end(struct inode *inode, struct buffer_head *dibh,
        unsigned char *buf = dibh->b_data + sizeof(struct gfs2_dinode);
 
        BUG_ON((pos + len) > (dibh->b_size - sizeof(struct gfs2_dinode)));
-       kaddr = kmap_atomic(page, KM_USER0);
+       kaddr = kmap_atomic(page);
        memcpy(buf + pos, kaddr + pos, copied);
        memset(kaddr + pos + copied, 0, len - copied);
        flush_dcache_page(page);
-       kunmap_atomic(kaddr, KM_USER0);
+       kunmap_atomic(kaddr);
 
        if (!PageUptodate(page))
                SetPageUptodate(page);

diff --git a/fs/gfs2/lops.c b/fs/gfs2/lops.c
index 0301be655b1229dad781a66aeab2b99327e9dbe0..df7c6e8d07649ba1ae9f24d2d2b58968236f6d96 100644 (file)
--- a/fs/gfs2/lops.c
+++ b/fs/gfs2/lops.c
@@ -553,11 +553,11 @@ static void gfs2_check_magic(struct buffer_head *bh)
        __be32 *ptr;
 
        clear_buffer_escaped(bh);
-       kaddr = kmap_atomic(bh->b_page, KM_USER0);
+       kaddr = kmap_atomic(bh->b_page);
        ptr = kaddr + bh_offset(bh);
        if (*ptr == cpu_to_be32(GFS2_MAGIC))
                set_buffer_escaped(bh);
-       kunmap_atomic(kaddr, KM_USER0);
+       kunmap_atomic(kaddr);
 }
 
 static void gfs2_write_blocks(struct gfs2_sbd *sdp, struct buffer_head *bh,
@@ -594,10 +594,10 @@ static void gfs2_write_blocks(struct gfs2_sbd *sdp, struct buffer_head *bh,
                if (buffer_escaped(bd->bd_bh)) {
                        void *kaddr;
                        bh1 = gfs2_log_get_buf(sdp);
-                       kaddr = kmap_atomic(bd->bd_bh->b_page, KM_USER0);
+                       kaddr = kmap_atomic(bd->bd_bh->b_page);
                        memcpy(bh1->b_data, kaddr + bh_offset(bd->bd_bh),
                               bh1->b_size);
-                       kunmap_atomic(kaddr, KM_USER0);
+                       kunmap_atomic(kaddr);
                        *(__be32 *)bh1->b_data = 0;
                        clear_buffer_escaped(bd->bd_bh);
                        unlock_buffer(bd->bd_bh);

diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c
index 7e528dc14f856a67a41a3101e3bede121ab3b3f5..762c1ddaa9fcc0615282fc79f35a4c9438d9a284 100644 (file)
--- a/fs/gfs2/quota.c
+++ b/fs/gfs2/quota.c
@@ -720,12 +720,12 @@ get_a_page:
 
        gfs2_trans_add_bh(ip->i_gl, bh, 0);
 
-       kaddr = kmap_atomic(page, KM_USER0);
+       kaddr = kmap_atomic(page);
        if (offset + sizeof(struct gfs2_quota) > PAGE_CACHE_SIZE)
                nbytes = PAGE_CACHE_SIZE - offset;
        memcpy(kaddr + offset, ptr, nbytes);
        flush_dcache_page(page);
-       kunmap_atomic(kaddr, KM_USER0);
+       kunmap_atomic(kaddr);
        unlock_page(page);
        page_cache_release(page);