Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2b5baad1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents faa4877f 4743e0ec

fs/xfs/linux-2.6/xfs_file.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -347,6 +347,7 @@ xfs_file_readdir( 




		size = buf.used;

		size = buf.used;

		de = (struct hack_dirent *)buf.dirent;

		de = (struct hack_dirent *)buf.dirent;

		curr_offset = de->offset /* & 0x7fffffff */;

		while (size > 0) {

		while (size > 0) {

			if (filldir(dirent, de->name, de->namlen,

			if (filldir(dirent, de->name, de->namlen,

					curr_offset & 0x7fffffff,

					curr_offset & 0x7fffffff,

fs/xfs/linux-2.6/xfs_iops.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -332,9 +332,7 @@ xfs_vn_mknod( 
		ASSERT(vp);

		ASSERT(vp);

		ip = vn_to_inode(vp);

		ip = vn_to_inode(vp);





		if (S_ISCHR(mode) || S_ISBLK(mode))

		if (S_ISDIR(mode))

			ip->i_rdev = rdev;

		else if (S_ISDIR(mode))

			xfs_validate_fields(ip);

			xfs_validate_fields(ip);

		d_instantiate(dentry, ip);

		d_instantiate(dentry, ip);

		xfs_validate_fields(dir);

		xfs_validate_fields(dir);