Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6

* 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6:
  [XFS] Initialise current offset in xfs_file_readdir correctly
  [XFS] Fix mknod regression

1 files changed, 1 insertions, 3 deletions

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);