more graceful recovery in umount_collect()

[deliverable/linux.git] / fs / ntfs / attrib.c

diff --git a/fs/ntfs/attrib.c b/fs/ntfs/attrib.c
index e0281992ddc33377bb47287d967336012c2d3d48..a27e3fecefaf817fc03c8a4cd57eae1969cdbf5f 100644 (file)
--- a/fs/ntfs/attrib.c
+++ b/fs/ntfs/attrib.c
@@ -1656,12 +1656,12 @@ int ntfs_attr_make_non_resident(ntfs_inode *ni, const u32 data_size)
        attr_size = le32_to_cpu(a->data.resident.value_length);
        BUG_ON(attr_size != data_size);
        if (page && !PageUptodate(page)) {
-               kaddr = kmap_atomic(page, KM_USER0);
+               kaddr = kmap_atomic(page);
                memcpy(kaddr, (u8*)a +
                                le16_to_cpu(a->data.resident.value_offset),
                                attr_size);
                memset(kaddr + attr_size, 0, PAGE_CACHE_SIZE - attr_size);
-               kunmap_atomic(kaddr, KM_USER0);
+               kunmap_atomic(kaddr);
                flush_dcache_page(page);
                SetPageUptodate(page);
        }
@@ -1806,9 +1806,9 @@ undo_err_out:
                        sizeof(a->data.resident.reserved));
        /* Copy the data from the page back to the attribute value. */
        if (page) {
-               kaddr = kmap_atomic(page, KM_USER0);
+               kaddr = kmap_atomic(page);
                memcpy((u8*)a + mp_ofs, kaddr, attr_size);
-               kunmap_atomic(kaddr, KM_USER0);
+               kunmap_atomic(kaddr);
        }
        /* Setup the allocated size in the ntfs inode in case it changed. */
        write_lock_irqsave(&ni->size_lock, flags);
@@ -2540,10 +2540,10 @@ int ntfs_attr_set(ntfs_inode *ni, const s64 ofs, const s64 cnt, const u8 val)
                size = PAGE_CACHE_SIZE;
                if (idx == end)
                        size = end_ofs;
-               kaddr = kmap_atomic(page, KM_USER0);
+               kaddr = kmap_atomic(page);
                memset(kaddr + start_ofs, val, size - start_ofs);
                flush_dcache_page(page);
-               kunmap_atomic(kaddr, KM_USER0);
+               kunmap_atomic(kaddr);
                set_page_dirty(page);
                page_cache_release(page);
                balance_dirty_pages_ratelimited(mapping);
@@ -2561,10 +2561,10 @@ int ntfs_attr_set(ntfs_inode *ni, const s64 ofs, const s64 cnt, const u8 val)
                                        "page (index 0x%lx).", idx);
                        return -ENOMEM;
                }
-               kaddr = kmap_atomic(page, KM_USER0);
+               kaddr = kmap_atomic(page);
                memset(kaddr, val, PAGE_CACHE_SIZE);
                flush_dcache_page(page);
-               kunmap_atomic(kaddr, KM_USER0);
+               kunmap_atomic(kaddr);
                /*
                 * If the page has buffers, mark them uptodate since buffer
                 * state and not page state is definitive in 2.6 kernels.
@@ -2598,10 +2598,10 @@ int ntfs_attr_set(ntfs_inode *ni, const s64 ofs, const s64 cnt, const u8 val)
                                        "(error, index 0x%lx).", idx);
                        return PTR_ERR(page);
                }
-               kaddr = kmap_atomic(page, KM_USER0);
+               kaddr = kmap_atomic(page);
                memset(kaddr, val, end_ofs);
                flush_dcache_page(page);
-               kunmap_atomic(kaddr, KM_USER0);
+               kunmap_atomic(kaddr);
                set_page_dirty(page);
                page_cache_release(page);
                balance_dirty_pages_ratelimited(mapping);