Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit bad60fdd14df32459e31cc75ab681e4458bf25cf

Authored by Christoph Hellwig
Committed by Lachlan McIlroy
1 parent 041388b54e
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[XFS] Fix mknod regression 

This was broken by my '[XFS] simplify xfs_create/mknod/symlink prototype',
which assigned the re-shuffled ondisk dev_t back to the rdev variable in
xfs_vn_mknod. Because of that i_rdev is set to the ondisk dev_t instead of
the linux dev_t later down the function.

Fortunately the fix for it is trivial: we can just remove the assignment
because xfs_revalidate_inode has done the proper job before unlocking the
inode.

SGI-PV: 974873
SGI-Modid: xfs-linux-melb:xfs-kern:30273a

Signed-off-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: David Chinner <dgc@sgi.com>
Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>

Showing 1 changed file with 1 additions and 3 deletions Side-by-side Diff

fs/xfs/linux-2.6/xfs_iops.c
Diff comments   View file @ bad60fd
... ... @@ -332,9 +332,7 @@
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);