Merge git://git.infradead.org/users/willy/linux-nvme

[mirror_ubuntu-bionic-kernel.git] / fs / ext4 / extents_status.c

diff --git a/fs/ext4/extents_status.c b/fs/ext4/extents_status.c
index 3981ff7839503df43a56ff282cd570d522bf764e..0a014a7194b28cac95e56f21b59f3776fcf8c9fc 100644 (file)
--- a/fs/ext4/extents_status.c
+++ b/fs/ext4/extents_status.c
@@ -184,7 +184,7 @@ static void ext4_es_print_tree(struct inode *inode)
        while (node) {
                struct extent_status *es;
                es = rb_entry(node, struct extent_status, rb_node);
-               printk(KERN_DEBUG " [%u/%u) %llu %llx",
+               printk(KERN_DEBUG " [%u/%u) %llu %x",
                       es->es_lblk, es->es_len,
                       ext4_es_pblock(es), ext4_es_status(es));
                node = rb_next(node);
@@ -445,8 +445,8 @@ static void ext4_es_insert_extent_ext_check(struct inode *inode,
                                pr_warn("ES insert assertion failed for "
                                        "inode: %lu we can find an extent "
                                        "at block [%d/%d/%llu/%c], but we "
-                                       "want to add an delayed/hole extent "
-                                       "[%d/%d/%llu/%llx]\n",
+                                       "want to add a delayed/hole extent "
+                                       "[%d/%d/%llu/%x]\n",
                                        inode->i_ino, ee_block, ee_len,
                                        ee_start, ee_status ? 'u' : 'w',
                                        es->es_lblk, es->es_len,
@@ -486,8 +486,8 @@ static void ext4_es_insert_extent_ext_check(struct inode *inode,
                if (!ext4_es_is_delayed(es) && !ext4_es_is_hole(es)) {
                        pr_warn("ES insert assertion failed for inode: %lu "
                                "can't find an extent at block %d but we want "
-                               "to add an written/unwritten extent "
-                               "[%d/%d/%llu/%llx]\n", inode->i_ino,
+                               "to add a written/unwritten extent "
+                               "[%d/%d/%llu/%x]\n", inode->i_ino,
                                es->es_lblk, es->es_lblk, es->es_len,
                                ext4_es_pblock(es), ext4_es_status(es));
                }
@@ -524,7 +524,7 @@ static void ext4_es_insert_extent_ind_check(struct inode *inode,
                         */
                        pr_warn("ES insert assertion failed for inode: %lu "
                                "We can find blocks but we want to add a "
-                               "delayed/hole extent [%d/%d/%llu/%llx]\n",
+                               "delayed/hole extent [%d/%d/%llu/%x]\n",
                                inode->i_ino, es->es_lblk, es->es_len,
                                ext4_es_pblock(es), ext4_es_status(es));
                        return;
@@ -554,7 +554,7 @@ static void ext4_es_insert_extent_ind_check(struct inode *inode,
                if (ext4_es_is_written(es)) {
                        pr_warn("ES insert assertion failed for inode: %lu "
                                "We can't find the block but we want to add "
-                               "an written extent [%d/%d/%llu/%llx]\n",
+                               "a written extent [%d/%d/%llu/%x]\n",
                                inode->i_ino, es->es_lblk, es->es_len,
                                ext4_es_pblock(es), ext4_es_status(es));
                        return;
@@ -658,8 +658,7 @@ int ext4_es_insert_extent(struct inode *inode, ext4_lblk_t lblk,
 
        newes.es_lblk = lblk;
        newes.es_len = len;
-       ext4_es_store_pblock(&newes, pblk);
-       ext4_es_store_status(&newes, status);
+       ext4_es_store_pblock_status(&newes, pblk, status);
        trace_ext4_es_insert_extent(inode, &newes);
 
        ext4_es_insert_extent_check(inode, &newes);
@@ -699,8 +698,7 @@ void ext4_es_cache_extent(struct inode *inode, ext4_lblk_t lblk,
 
        newes.es_lblk = lblk;
        newes.es_len = len;
-       ext4_es_store_pblock(&newes, pblk);
-       ext4_es_store_status(&newes, status);
+       ext4_es_store_pblock_status(&newes, pblk, status);
        trace_ext4_es_cache_extent(inode, &newes);
 
        if (!len)
@@ -812,13 +810,13 @@ retry:
 
                        newes.es_lblk = end + 1;
                        newes.es_len = len2;
+                       block = 0x7FDEADBEEF;
                        if (ext4_es_is_written(&orig_es) ||
-                           ext4_es_is_unwritten(&orig_es)) {
+                           ext4_es_is_unwritten(&orig_es))
                                block = ext4_es_pblock(&orig_es) +
                                        orig_es.es_len - len2;
-                               ext4_es_store_pblock(&newes, block);
-                       }
-                       ext4_es_store_status(&newes, ext4_es_status(&orig_es));
+                       ext4_es_store_pblock_status(&newes, block,
+                                                   ext4_es_status(&orig_es));
                        err = __es_insert_extent(inode, &newes);
                        if (err) {
                                es->es_lblk = orig_es.es_lblk;