1 files changed, 32 insertions, 17 deletions

diff --git a/fs/f2fs/inode.c b/fs/f2fs/inode.c
index c8c058024af8..7377ca3ce5c5 100644
--- a/fs/f2fs/inode.c
+++ b/fs/f2fs/inode.c
@@ -37,6 +37,31 @@ void f2fs_set_inode_flags(struct inode *inode)
                 inode->i_flags |= S_DIRSYNC;
 }
 
+static void __get_inode_rdev(struct inode *inode, struct f2fs_inode *ri)
+{
+        if (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode) ||
+                        S_ISFIFO(inode->i_mode) || S_ISSOCK(inode->i_mode)) {
+                if (ri->i_addr[0])
+                        inode->i_rdev = old_decode_dev(le32_to_cpu(ri->i_addr[0]));
+                else
+                        inode->i_rdev = new_decode_dev(le32_to_cpu(ri->i_addr[1]));
+        }
+}
+
+static void __set_inode_rdev(struct inode *inode, struct f2fs_inode *ri)
+{
+        if (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode)) {
+                if (old_valid_dev(inode->i_rdev)) {
+                        ri->i_addr[0] = cpu_to_le32(old_encode_dev(inode->i_rdev));
+                        ri->i_addr[1] = 0;
+                } else {
+                        ri->i_addr[0] = 0;
+                        ri->i_addr[1] = cpu_to_le32(new_encode_dev(inode->i_rdev));
+                        ri->i_addr[2] = 0;
+                }
+        }
+}
+
 static int do_read_inode(struct inode *inode)
 {
         struct f2fs_sb_info *sbi = F2FS_SB(inode->i_sb);
@@ -73,10 +98,6 @@ static int do_read_inode(struct inode *inode)
         inode->i_ctime.tv_nsec = le32_to_cpu(ri->i_ctime_nsec);
         inode->i_mtime.tv_nsec = le32_to_cpu(ri->i_mtime_nsec);
         inode->i_generation = le32_to_cpu(ri->i_generation);
-        if (ri->i_addr[0])
-                inode->i_rdev = old_decode_dev(le32_to_cpu(ri->i_addr[0]));
-        else
-                inode->i_rdev = new_decode_dev(le32_to_cpu(ri->i_addr[1]));
 
         fi->i_current_depth = le32_to_cpu(ri->i_current_depth);
         fi->i_xattr_nid = le32_to_cpu(ri->i_xattr_nid);
@@ -84,8 +105,13 @@ static int do_read_inode(struct inode *inode)
         fi->flags = 0;
         fi->i_advise = ri->i_advise;
         fi->i_pino = le32_to_cpu(ri->i_pino);
+
         get_extent_info(&fi->ext, ri->i_ext);
         get_inline_info(fi, ri);
+
+        /* get rdev by using inline_info */
+        __get_inode_rdev(inode, ri);
+
         f2fs_put_page(node_page, 1);
         return 0;
 }
@@ -179,21 +205,10 @@ void update_inode(struct inode *inode, struct page *node_page)
         ri->i_pino = cpu_to_le32(F2FS_I(inode)->i_pino);
         ri->i_generation = cpu_to_le32(inode->i_generation);
 
-        if (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode)) {
-                if (old_valid_dev(inode->i_rdev)) {
-                        ri->i_addr[0] =
-                                cpu_to_le32(old_encode_dev(inode->i_rdev));
-                        ri->i_addr[1] = 0;
-                } else {
-                        ri->i_addr[0] = 0;
-                        ri->i_addr[1] =
-                                cpu_to_le32(new_encode_dev(inode->i_rdev));
-                        ri->i_addr[2] = 0;
-                }
-        }
-
+        __set_inode_rdev(inode, ri);
         set_cold_node(inode, node_page);
         set_page_dirty(node_page);
+
         clear_inode_flag(F2FS_I(inode), FI_DIRTY_INODE);
 }