NTFS: Rename ntfs_merge_runlists() to ntfs_runlists_merge().

Signed-off-by: Anton Altaparmakov <aia21@cantab.net>

diff --git a/fs/ntfs/ChangeLog b/fs/ntfs/ChangeLog
index 3518677ab23ef32c739e8fb37fb7361d249efbd7..52b1dd59f06c8e3035ecfdcfe2ed63848faeb8ce 100644 (file)
--- a/fs/ntfs/ChangeLog
+++ b/fs/ntfs/ChangeLog
@@ -29,7 +29,8 @@ ToDo/Notes:
        - Add vol->mft_data_pos and initialize it at mount time.
        - Rename init_runlist() to ntfs_init_runlist(), ntfs_vcn_to_lcn() to
          ntfs_rl_vcn_to_lcn(), decompress_mapping_pairs() to
-         ntfs_mapping_pairs_decompress() and adapt all callers.
+         ntfs_mapping_pairs_decompress(), ntfs_merge_runlists() to
+         ntfs_runlists_merge() and adapt all callers.
        - Add fs/ntfs/runlist.[hc]::ntfs_get_nr_significant_bytes(),
          ntfs_get_size_for_mapping_pairs(), ntfs_write_significant_bytes(),
          and ntfs_mapping_pairs_build(), adapted from libntfs.

diff --git a/fs/ntfs/inode.c b/fs/ntfs/inode.c
index 991b1de122ab940936c925ebfba3bf9d9816bd0f..900439db32e6cefdc81af6cad9dce310f867c456 100644 (file)
--- a/fs/ntfs/inode.c
+++ b/fs/ntfs/inode.c
@@ -1673,7 +1673,7 @@ err_out:
  * We solve these problems by starting with the $DATA attribute before anything
  * else and iterating using ntfs_attr_lookup($DATA) over all extents.  As each
  * extent is found, we ntfs_mapping_pairs_decompress() including the implied
- * ntfs_merge_runlists().  Each step of the iteration necessarily provides
+ * ntfs_runlists_merge().  Each step of the iteration necessarily provides
  * sufficient information for the next step to complete.
  *
  * This should work but there are two possible pit falls (see inline comments

diff --git a/fs/ntfs/runlist.c b/fs/ntfs/runlist.c
index ac44caaae866a8706708461483a8645feac57d06..29e28d844cc05a218d2a017cc492b47a3f33028f 100644 (file)
--- a/fs/ntfs/runlist.c
+++ b/fs/ntfs/runlist.c
@@ -449,7 +449,7 @@ static inline runlist_element *ntfs_rl_split(runlist_element *dst, int dsize,
 }
 
 /**
- * ntfs_merge_runlists - merge two runlists into one
+ * ntfs_runlists_merge - merge two runlists into one
  * @drl:       original runlist to be worked on
  * @srl:       new runlist to be merged into @drl
  *
@@ -482,7 +482,7 @@ static inline runlist_element *ntfs_rl_split(runlist_element *dst, int dsize,
  *     -EINVAL - Invalid parameters were passed in.
  *     -ERANGE - The runlists overlap and cannot be merged.
  */
-runlist_element *ntfs_merge_runlists(runlist_element *drl,
+runlist_element *ntfs_runlists_merge(runlist_element *drl,
                runlist_element *srl)
 {
        int di, si;             /* Current index into @[ds]rl. */
@@ -915,7 +915,7 @@ mpa_err:
                return rl;
        }
        /* Now combine the new and old runlists checking for overlaps. */
-       old_rl = ntfs_merge_runlists(old_rl, rl);
+       old_rl = ntfs_runlists_merge(old_rl, rl);
        if (likely(!IS_ERR(old_rl)))
                return old_rl;
        ntfs_free(rl);

diff --git a/fs/ntfs/runlist.h b/fs/ntfs/runlist.h
index cc230c8dec8cef83687577b4f0a3336a91746443..c3752c7a140923cbc053a409c77d8ebf0c243659 100644 (file)
--- a/fs/ntfs/runlist.h
+++ b/fs/ntfs/runlist.h
@@ -40,6 +40,9 @@ typedef enum {
        LCN_ENOENT              = -3,
 } LCN_SPECIAL_VALUES;
 
+extern runlist_element *ntfs_runlists_merge(runlist_element *drl,
+               runlist_element *srl);
+
 extern runlist_element *ntfs_mapping_pairs_decompress(const ntfs_volume *vol,
                const ATTR_RECORD *attr, runlist_element *old_rl);