4 files changed, 4 insertions, 7 deletions

diff --git a/fs/gfs2/dir.c b/fs/gfs2/dir.c
index ca23c8beb3f0..c82d7cb4a654 100644
--- a/fs/gfs2/dir.c
+++ b/fs/gfs2/dir.c
@@ -902,7 +902,6 @@ static int dir_make_exhash(struct inode *inode)
         dip->i_di.di_size = sdp->sd_sb.sb_bsize / 2;
         dip->i_di.di_blocks++;
         dip->i_di.di_flags |= GFS2_DIF_EXHASH;
-        dip->i_di.di_payload_format = 0;
 
         for (x = sdp->sd_hash_ptrs, y = -1; x; x >>= 1, y++) ;
         dip->i_di.di_depth = y;
diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
index c22ae3c3a444..f6177fc68320 100644
--- a/fs/gfs2/inode.c
+++ b/fs/gfs2/inode.c
@@ -210,7 +210,6 @@ static int gfs2_dinode_in(struct gfs2_inode *ip, const void *buf)
         di->di_generation = be64_to_cpu(str->di_generation);
 
         di->di_flags = be32_to_cpu(str->di_flags);
-        di->di_payload_format = be32_to_cpu(str->di_payload_format);
         di->di_height = be16_to_cpu(str->di_height);
 
         di->di_depth = be16_to_cpu(str->di_depth);
@@ -699,7 +698,7 @@ static void init_dinode(struct gfs2_inode *dip, struct gfs2_glock *gl,
         }
 
         di->__pad1 = 0;
-        di->di_payload_format = cpu_to_be32(0);
+        di->di_payload_format = cpu_to_be32(S_ISDIR(mode) ? GFS2_FORMAT_DE : 0);
         di->di_height = cpu_to_be32(0);
         di->__pad2 = 0;
         di->__pad3 = 0;
diff --git a/fs/gfs2/ondisk.c b/fs/gfs2/ondisk.c
index 82003e872a37..b2baba5c50b7 100644
--- a/fs/gfs2/ondisk.c
+++ b/fs/gfs2/ondisk.c
@@ -176,9 +176,10 @@ void gfs2_dinode_out(const struct gfs2_inode *ip, void *buf)
         str->di_generation = cpu_to_be64(di->di_generation);
 
         str->di_flags = cpu_to_be32(di->di_flags);
-        str->di_payload_format = cpu_to_be32(di->di_payload_format);
         str->di_height = cpu_to_be16(di->di_height);
-
+        str->di_payload_format = cpu_to_be32(S_ISDIR(ip->i_inode.i_mode) &&
+                                             !(ip->i_di.di_flags & GFS2_DIF_EXHASH) ?
+                                             GFS2_FORMAT_DE : 0);
         str->di_depth = cpu_to_be16(di->di_depth);
         str->di_entries = cpu_to_be32(di->di_entries);
 
@@ -197,7 +198,6 @@ void gfs2_dinode_print(const struct gfs2_inode *ip)
         printk(KERN_INFO "  di_goal_data = %llu\n", (unsigned long long)di->di_goal_data);
 
         pv(di, di_flags, "0x%.8X");
-        pv(di, di_payload_format, "%u");
         pv(di, di_height, "%u");
 
         pv(di, di_depth, "%u");
diff --git a/fs/gfs2/ops_inode.c b/fs/gfs2/ops_inode.c
index 585b43a94ace..0e4eade47bf2 100644
--- a/fs/gfs2/ops_inode.c
+++ b/fs/gfs2/ops_inode.c
@@ -389,7 +389,6 @@ static int gfs2_mkdir(struct inode *dir, struct dentry *dentry, int mode)
         ip->i_inode.i_nlink = 2;
         ip->i_di.di_size = sdp->sd_sb.sb_bsize - sizeof(struct gfs2_dinode);
         ip->i_di.di_flags |= GFS2_DIF_JDATA;
-        ip->i_di.di_payload_format = GFS2_FORMAT_DE;
         ip->i_di.di_entries = 2;
 
         error = gfs2_meta_inode_buffer(ip, &dibh);