tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 2b5baad1 faa4877f

+2 -3
+1
fs/xfs/linux-2.6/xfs_file.c
··· 347 347 348 348 size = buf.used; 349 349 de = (struct hack_dirent *)buf.dirent; 350 + curr_offset = de->offset /* & 0x7fffffff */; 350 351 while (size > 0) { 351 352 if (filldir(dirent, de->name, de->namlen, 352 353 curr_offset & 0x7fffffff,
+1 -3
fs/xfs/linux-2.6/xfs_iops.c
··· 332 332 ASSERT(vp); 333 333 ip = vn_to_inode(vp); 334 334 335 - if (S_ISCHR(mode) || S_ISBLK(mode)) 336 - ip->i_rdev = rdev; 337 - else if (S_ISDIR(mode)) 335 + if (S_ISDIR(mode)) 338 336 xfs_validate_fields(ip); 339 337 d_instantiate(dentry, ip); 340 338 xfs_validate_fields(dir);