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
This commit is contained in:
commit
2b5baad165
|
@ -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,
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue