udf: use kmap_atomic for memcpy copying

Use temporary mapping for memory copying operations.

To avoid any sleeping problem,

mark_inode_dirty(inode) was moved after kunmap() in
udf_adinicb_readpage()

down_write(&iinfo->i_data_sem) set before kmap_atomic()
in udf_expand_file_adinicb()

Signed-off-by: Fabian Frederick <fabf@skynet.be>
Signed-off-by: Jan Kara <jack@suse.cz>

diff --git a/fs/udf/file.c b/fs/udf/file.c
index e04cc0cdca9d736683c4fc5ac647e7fbdcc872c4..f5eb2d5b3bac86d91eaaddddbec6237dbbadfa38 100644 (file)
--- a/fs/udf/file.c
+++ b/fs/udf/file.c
@@ -44,12 +44,12 @@ static void __udf_adinicb_readpage(struct page *page)
        char *kaddr;
        struct udf_inode_info *iinfo = UDF_I(inode);
 
        char *kaddr;
        struct udf_inode_info *iinfo = UDF_I(inode);
 

-       kaddr = kmap(page);
+       kaddr = kmap_atomic(page);

        memcpy(kaddr, iinfo->i_ext.i_data + iinfo->i_lenEAttr, inode->i_size);
        memset(kaddr + inode->i_size, 0, PAGE_SIZE - inode->i_size);
        flush_dcache_page(page);
        SetPageUptodate(page);
        memcpy(kaddr, iinfo->i_ext.i_data + iinfo->i_lenEAttr, inode->i_size);
        memset(kaddr + inode->i_size, 0, PAGE_SIZE - inode->i_size);
        flush_dcache_page(page);
        SetPageUptodate(page);

-       kunmap(page);
+       kunmap_atomic(kaddr);

 }
 
 static int udf_adinicb_readpage(struct file *file, struct page *page)
 }
 
 static int udf_adinicb_readpage(struct file *file, struct page *page)


@@ -70,11 +70,11 @@ static int udf_adinicb_writepage(struct page *page,
 
        BUG_ON(!PageLocked(page));
 
 
        BUG_ON(!PageLocked(page));
 

-       kaddr = kmap(page);
+       kaddr = kmap_atomic(page);

        memcpy(iinfo->i_ext.i_data + iinfo->i_lenEAttr, kaddr, inode->i_size);
        memcpy(iinfo->i_ext.i_data + iinfo->i_lenEAttr, kaddr, inode->i_size);

-       mark_inode_dirty(inode);

        SetPageUptodate(page);
        SetPageUptodate(page);

-       kunmap(page);
+       kunmap_atomic(kaddr);
+       mark_inode_dirty(inode);

        unlock_page(page);
 
        return 0;
        unlock_page(page);
 
        return 0;

diff --git a/fs/udf/inode.c b/fs/udf/inode.c
index 8715dcd115965a52e8dabd0432f29413e6be9ef0..98c510e172032df27a92b296507a3c1cb3017cdb 100644 (file)
--- a/fs/udf/inode.c
+++ b/fs/udf/inode.c
@@ -276,14 +276,14 @@ int udf_expand_file_adinicb(struct inode *inode)
                return -ENOMEM;
 
        if (!PageUptodate(page)) {
                return -ENOMEM;
 
        if (!PageUptodate(page)) {

-               kaddr = kmap(page);
+               kaddr = kmap_atomic(page);

                memset(kaddr + iinfo->i_lenAlloc, 0x00,
                       PAGE_SIZE - iinfo->i_lenAlloc);
                memcpy(kaddr, iinfo->i_ext.i_data + iinfo->i_lenEAttr,
                        iinfo->i_lenAlloc);
                flush_dcache_page(page);
                SetPageUptodate(page);
                memset(kaddr + iinfo->i_lenAlloc, 0x00,
                       PAGE_SIZE - iinfo->i_lenAlloc);
                memcpy(kaddr, iinfo->i_ext.i_data + iinfo->i_lenEAttr,
                        iinfo->i_lenAlloc);
                flush_dcache_page(page);
                SetPageUptodate(page);

-               kunmap(page);
+               kunmap_atomic(kaddr);

        }
        down_write(&iinfo->i_data_sem);
        memset(iinfo->i_ext.i_data + iinfo->i_lenEAttr, 0x00,
        }
        down_write(&iinfo->i_data_sem);
        memset(iinfo->i_ext.i_data + iinfo->i_lenEAttr, 0x00,


@@ -300,11 +300,11 @@ int udf_expand_file_adinicb(struct inode *inode)
        if (err) {
                /* Restore everything back so that we don't lose data... */
                lock_page(page);
        if (err) {
                /* Restore everything back so that we don't lose data... */
                lock_page(page);

-               kaddr = kmap(page);

                down_write(&iinfo->i_data_sem);
                down_write(&iinfo->i_data_sem);

+               kaddr = kmap_atomic(page);

                memcpy(iinfo->i_ext.i_data + iinfo->i_lenEAttr, kaddr,
                       inode->i_size);
                memcpy(iinfo->i_ext.i_data + iinfo->i_lenEAttr, kaddr,
                       inode->i_size);

-               kunmap(page);
+               kunmap_atomic(kaddr);

                unlock_page(page);
                iinfo->i_alloc_type = ICBTAG_FLAG_AD_IN_ICB;
                inode->i_data.a_ops = &udf_adinicb_aops;
                unlock_page(page);
                iinfo->i_alloc_type = ICBTAG_FLAG_AD_IN_ICB;
                inode->i_data.a_ops = &udf_adinicb_aops;