Re: [PATCH 35/56] ntfs: Remove void casts

[Jack Stone]

Fixed patch,

Thanks,

Jack

--

ntfs: Remove void casts

From: Jack Stone <jwjstone@xxxxxxxxxxx>

Remove uneeded void casts

Signed-Off-By: Jack Stone <jwjstone@xxxxxxxxxxx>
---

 fs/ntfs/dir.c     |    8 ++++----
 fs/ntfs/index.c   |    2 +-
 fs/ntfs/super.c   |    8 ++++----
 fs/ntfs/usnjrnl.c |    2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/fs/ntfs/dir.c b/fs/ntfs/dir.c
index 5a9e344..c373301 100644
--- a/fs/ntfs/dir.c
+++ b/fs/ntfs/dir.c
@@ -326,7 +326,7 @@ descend_into_child_node:
         goto err_out;
     }
     lock_page(page);
-    kaddr = (u8*)page_address(page);
+    kaddr = page_address(page);
 fast_descend_into_child_node:
     /* Get to the index allocation block. */
     ia = (INDEX_ALLOCATION*)(kaddr + ((vcn <<
@@ -804,7 +804,7 @@ descend_into_child_node:
         goto err_out;
     }
     lock_page(page);
-    kaddr = (u8*)page_address(page);
+    kaddr = page_address(page);
 fast_descend_into_child_node:
     /* Get to the index allocation block. */
     ia = (INDEX_ALLOCATION*)(kaddr + ((vcn <<
@@ -1279,7 +1279,7 @@ get_next_bmp_page:
         bmp_page = NULL;
         goto iput_err_out;
     }
-    bmp = (u8*)page_address(bmp_page);
+    bmp = page_address(bmp_page);
     /* Find next index block in use. */
     while (!(bmp[cur_bmp_pos >> 3] & (1 << (cur_bmp_pos & 7)))) {
 find_next_index_buffer:
@@ -1322,7 +1322,7 @@ find_next_index_buffer:
             goto err_out;
         }
         lock_page(ia_page);
-        kaddr = (u8*)page_address(ia_page);
+        kaddr = page_address(ia_page);
     }
     /* Get the current index buffer. */
     ia = (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_CACHE_MASK &
diff --git a/fs/ntfs/index.c b/fs/ntfs/index.c
index 2194eff..16a8b2e 100644
--- a/fs/ntfs/index.c
+++ b/fs/ntfs/index.c
@@ -282,7 +282,7 @@ descend_into_child_node:
         goto err_out;
     }
     lock_page(page);
-    kaddr = (u8*)page_address(page);
+    kaddr = page_address(page);
 fast_descend_into_child_node:
     /* Get to the index allocation block. */
     ia = (INDEX_ALLOCATION*)(kaddr + ((vcn <<
diff --git a/fs/ntfs/super.c b/fs/ntfs/super.c
index f76951d..d05bccf 100644
--- a/fs/ntfs/super.c
+++ b/fs/ntfs/super.c
@@ -1295,7 +1295,7 @@ static int
check_windows_hibernation_status(ntfs_volume *vol)
         ret = PTR_ERR(page);
         goto iput_out;
     }
-    kaddr = (u32*)page_address(page);
+    kaddr = page_address(page);
     if (*(le32*)kaddr == cpu_to_le32(0x72626968)/*'hibr'*/) {
         ntfs_debug("Magic \"hibr\" found in hiberfil.sys.  Windows is "
                 "hibernated on the volume.  This is the "
@@ -1515,7 +1515,7 @@ not_enabled:
                 "attribute.");
         return false;
     }
-    uh = (USN_HEADER*)page_address(page);
+    uh = page_address(page);
     /* Sanity check the $Max. */
     if (unlikely(sle64_to_cpu(uh->allocation_delta) >
             sle64_to_cpu(uh->maximum_size))) {
@@ -2501,7 +2501,7 @@ static s64 get_nr_free_clusters(ntfs_volume *vol)
             nr_free -= PAGE_CACHE_SIZE * 8;
             continue;
         }
-        kaddr = (u32*)kmap_atomic(page, KM_USER0);
+        kaddr = kmap_atomic(page, KM_USER0);
         /*
          * For each 4 bytes, subtract the number of set bits. If this
          * is the last page and it is partial we don't really care as
@@ -2572,7 +2572,7 @@ static unsigned long
__get_nr_free_mft_records(ntfs_volume *vol,
             nr_free -= PAGE_CACHE_SIZE * 8;
             continue;
         }
-        kaddr = (u32*)kmap_atomic(page, KM_USER0);
+        kaddr = kmap_atomic(page, KM_USER0);
         /*
          * For each 4 bytes, subtract the number of set bits. If this
          * is the last page and it is partial we don't really care as
diff --git a/fs/ntfs/usnjrnl.c b/fs/ntfs/usnjrnl.c
index b2bc0d5..5c8fdd7 100644
--- a/fs/ntfs/usnjrnl.c
+++ b/fs/ntfs/usnjrnl.c
@@ -58,7 +58,7 @@ bool ntfs_stamp_usnjrnl(ntfs_volume *vol)
                     "$UsnJrnl/$DATA/$Max attribute.");
             return false;
         }
-        uh = (USN_HEADER*)page_address(page);
+        uh = page_address(page);
         stamp = get_current_ntfs_time();
         ntfs_debug("Stamping transaction log ($UsnJrnl): old "
                 "journal_id 0x%llx, old lowest_valid_usn "
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/