2 files changed, 2 insertions, 3 deletions

diff --git a/fs/xfs/linux-2.6/xfs_file.c b/fs/xfs/linux-2.6/xfs_file.c
index e1fcef2eb928..4847eb83fc18 100644
--- a/fs/xfs/linux-2.6/xfs_file.c
+++ b/fs/xfs/linux-2.6/xfs_file.c
@@ -347,6 +347,7 @@ xfs_file_readdir(
 
                 size = buf.used;
                 de = (struct hack_dirent *)buf.dirent;
+                curr_offset = de->offset /* & 0x7fffffff */;
                 while (size > 0) {
                         if (filldir(dirent, de->name, de->namlen,
                                         curr_offset & 0x7fffffff,
diff --git a/fs/xfs/linux-2.6/xfs_iops.c b/fs/xfs/linux-2.6/xfs_iops.c
index 37e116779eb1..5e8bb7f71b5a 100644
--- a/fs/xfs/linux-2.6/xfs_iops.c
+++ b/fs/xfs/linux-2.6/xfs_iops.c
@@ -332,9 +332,7 @@ xfs_vn_mknod(
                 ASSERT(vp);
                 ip = vn_to_inode(vp);
 
-                if (S_ISCHR(mode) || S_ISBLK(mode))
-                        ip->i_rdev = rdev;
-                else if (S_ISDIR(mode))
+                if (S_ISDIR(mode))
                         xfs_validate_fields(ip);
                 d_instantiate(dentry, ip);
                 xfs_validate_fields(dir);