Merge branch 'work.lookup' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[platform/kernel/linux-rpi.git] / fs / btrfs / export.c

diff --git a/fs/btrfs/export.c b/fs/btrfs/export.c
index 1f3755b..ddf28ec 100644 (file)
--- a/fs/btrfs/export.c
+++ b/fs/btrfs/export.c
@@ -33,7 +33,7 @@ static int btrfs_encode_fh(struct inode *inode, u32 *fh, int *max_len,
        type = FILEID_BTRFS_WITHOUT_PARENT;
 
        fid->objectid = btrfs_ino(BTRFS_I(inode));
-       fid->root_objectid = BTRFS_I(inode)->root->objectid;
+       fid->root_objectid = BTRFS_I(inode)->root->root_key.objectid;
        fid->gen = inode->i_generation;
 
        if (parent) {
@@ -41,7 +41,7 @@ static int btrfs_encode_fh(struct inode *inode, u32 *fh, int *max_len,
 
                fid->parent_objectid = BTRFS_I(parent)->location.objectid;
                fid->parent_gen = parent->i_generation;
-               parent_root_id = BTRFS_I(parent)->root->objectid;
+               parent_root_id = BTRFS_I(parent)->root->root_key.objectid;
 
                if (parent_root_id != fid->root_objectid) {
                        fid->parent_root_objectid = parent_root_id;