xfs
[Top] [All Lists]

[PATCH] xfs: fix exporting with left over 64-bit inodes

To: xfs@xxxxxxxxxxx
Subject: [PATCH] xfs: fix exporting with left over 64-bit inodes
From: Christoph Hellwig <hch@xxxxxxxxxxxxx>
Date: Fri, 19 Nov 2010 08:38:49 -0500
Cc: Samuel Kvasnica <samuel.kvasnica@xxxxxxxxx>
User-agent: Mutt/1.5.21 (2010-09-15)
From: Samuel Kvasnica <samuel.kvasnica@xxxxxxxxx>

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@xxxxxx>

Index: xfs/fs/xfs/linux-2.6/xfs_export.c
===================================================================
--- xfs.orig/fs/xfs/linux-2.6/xfs_export.c      2010-11-10 17:08:27.341529680 
+0100
+++ xfs/fs/xfs/linux-2.6/xfs_export.c   2010-11-10 17:10:10.321529680 +0100
@@ -70,8 +70,16 @@ xfs_fs_encode_fh(
        else
                fileid_type = FILEID_INO32_GEN_PARENT;
 
-       /* filesystem may contain 64bit inode numbers */
-       if (!(XFS_M(inode->i_sb)->m_flags & XFS_MOUNT_SMALL_INUMS))
+       /*
+        * If the the filesystem may contain 64bit inode numbers, we need
+        * to use larger file handles that can represent them.
+        *
+        * While we only allocate inodes that do not fit into 32 bits any
+        * large enough filesystem may contain them, thus the slightly
+        * confusing looking conditional below.
+        */
+       if (!(XFS_M(inode->i_sb)->m_flags & XFS_MOUNT_SMALL_INUMS) ||
+           (XFS_M(inode->i_sb)->m_flags & XFS_MOUNT_32BITINODES))
                fileid_type |= XFS_FILEID_TYPE_64FLAG;
 
        /*

<Prev in Thread] Current Thread [Next in Thread>