Merge branch 'we21-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...

[powerpc.git] / fs / gfs2 / ops_inode.c

diff --git a/fs/gfs2/ops_inode.c b/fs/gfs2/ops_inode.c
index 2f38313..ef6e5ed 100644 (file)
--- a/fs/gfs2/ops_inode.c
+++ b/fs/gfs2/ops_inode.c
@@ -19,10 +19,10 @@
 #include <linux/posix_acl.h>
 #include <linux/gfs2_ondisk.h>
 #include <linux/crc32.h>
+#include <linux/lm_interface.h>
 #include <asm/uaccess.h>
 
 #include "gfs2.h"
-#include "lm_interface.h"
 #include "incore.h"
 #include "acl.h"
 #include "bmap.h"
@@ -404,17 +404,17 @@ static int gfs2_mkdir(struct inode *dir, struct dentry *dentry, int mode)
                gfs2_trans_add_bh(ip->i_gl, dibh, 1);
                gfs2_qstr2dirent(&str, GFS2_DIRENT_SIZE(str.len), dent);
                dent->de_inum = di->di_num; /* already GFS2 endian */
-               dent->de_type = DT_DIR;
+               dent->de_type = cpu_to_be16(DT_DIR);
                di->di_entries = cpu_to_be32(1);
 
                gfs2_str2qstr(&str, "..");
                dent = (struct gfs2_dirent *)((char*)dent + GFS2_DIRENT_SIZE(1));
                gfs2_qstr2dirent(&str, dibh->b_size - GFS2_DIRENT_SIZE(1) - sizeof(struct gfs2_dinode), dent);
 
-               gfs2_inum_out(&dip->i_num, (char *) &dent->de_inum);
-               dent->de_type = DT_DIR;
+               gfs2_inum_out(&dip->i_num, &dent->de_inum);
+               dent->de_type = cpu_to_be16(DT_DIR);
 
-               gfs2_dinode_out(&ip->i_di, (char *)di);
+               gfs2_dinode_out(&ip->i_di, di);
 
                brelse(dibh);
        }
@@ -522,7 +522,7 @@ static int gfs2_mknod(struct inode *dir, struct dentry *dentry, int mode,
        case S_IFSOCK:
                break;
        default:
-               return -EOPNOTSUPP;             
+               return -EOPNOTSUPP;
        };
 
        gfs2_holder_init(dip->i_gl, 0, 0, ghs);