Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 576ecb8e2b725726471cc62b12c01e28d33127ba

Authored by Samuel Kvasnica
Committed by Alex Elder
1 parent 05340d4ab2
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 exporting with left over 64-bit inodes 

We now support mounting and using filesystems with 64-bit inodes
even when not mounted with the inode64 option (which now only
controls if we allocate new inodes in that space or not).  Make sure
we always use large NFS file handles when exporting a filesystem
that may contain 64-bit inodes.  Note that this only affects newly
generated file handles, any outstanding 32-bit file handle is still
accepted.

[hch: the comment and commit log are mine, the rest is from a patch
 snipplet from Samuel]

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Alex Elder <aelder@sgi.com>

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

fs/xfs/linux-2.6/xfs_export.c
Diff comments   View file @ 576ecb8
... ... @@ -70,8 +70,16 @@
70 70 else
71 71 fileid_type = FILEID_INO32_GEN_PARENT;
72 72  
73   - /* filesystem may contain 64bit inode numbers */
74   - if (!(XFS_M(inode->i_sb)->m_flags & XFS_MOUNT_SMALL_INUMS))
  73 + /*
  74 + * If the the filesystem may contain 64bit inode numbers, we need
  75 + * to use larger file handles that can represent them.
  76 + *
  77 + * While we only allocate inodes that do not fit into 32 bits any
  78 + * large enough filesystem may contain them, thus the slightly
  79 + * confusing looking conditional below.
  80 + */
  81 + if (!(XFS_M(inode->i_sb)->m_flags & XFS_MOUNT_SMALL_INUMS) ||
  82 + (XFS_M(inode->i_sb)->m_flags & XFS_MOUNT_32BITINODES))
75 83 fileid_type |= XFS_FILEID_TYPE_64FLAG;
76 84  
77 85 /*