lkml.org 
[lkml]   [2011]   [Dec]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[31/45] xfs: fix nfs export of 64-bit inodes numbers on 32-bit kernels
    3.0-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Christoph Hellwig <hch@infradead.org>

    commit c29f7d457ac63311feb11928a866efd2fe153d74 upstream.

    The i_ino field in the VFS inode is of type unsigned long and thus can't
    hold the full 64-bit inode number on 32-bit kernels. We have the full
    inode number in the XFS inode, so use that one for nfs exports. Note
    that I've also switched the 32-bit file handles types to it, just to make
    the code more consistent and copy & paste errors less likely to happen.

    Reported-by: Guoquan Yang <ygq51@hotmail.com>
    Reported-by: Hank Peng <pengxihan@gmail.com>
    Signed-off-by: Christoph Hellwig <hch@lst.de>
    Signed-off-by: Ben Myers <bpm@sgi.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    fs/xfs/linux-2.6/xfs_export.c | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    --- a/fs/xfs/linux-2.6/xfs_export.c
    +++ b/fs/xfs/linux-2.6/xfs_export.c
    @@ -98,22 +98,22 @@ xfs_fs_encode_fh(
    switch (fileid_type) {
    case FILEID_INO32_GEN_PARENT:
    spin_lock(&dentry->d_lock);
    - fid->i32.parent_ino = dentry->d_parent->d_inode->i_ino;
    + fid->i32.parent_ino = XFS_I(dentry->d_parent->d_inode)->i_ino;
    fid->i32.parent_gen = dentry->d_parent->d_inode->i_generation;
    spin_unlock(&dentry->d_lock);
    /*FALLTHRU*/
    case FILEID_INO32_GEN:
    - fid->i32.ino = inode->i_ino;
    + fid->i32.ino = XFS_I(inode)->i_ino;
    fid->i32.gen = inode->i_generation;
    break;
    case FILEID_INO32_GEN_PARENT | XFS_FILEID_TYPE_64FLAG:
    spin_lock(&dentry->d_lock);
    - fid64->parent_ino = dentry->d_parent->d_inode->i_ino;
    + fid64->parent_ino = XFS_I(dentry->d_parent->d_inode)->i_ino;
    fid64->parent_gen = dentry->d_parent->d_inode->i_generation;
    spin_unlock(&dentry->d_lock);
    /*FALLTHRU*/
    case FILEID_INO32_GEN | XFS_FILEID_TYPE_64FLAG:
    - fid64->ino = inode->i_ino;
    + fid64->ino = XFS_I(inode)->i_ino;
    fid64->gen = inode->i_generation;
    break;
    }



    \
     
     \ /
      Last update: 2011-12-16 21:03    [W:2.438 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site