diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-08-18 13:10:20 +0100 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2008-09-25 11:04:06 -0400 |
| commit | 32d48fa1af1fe066a6a4798e6f5a50ac6a3ce4a3 (patch) | |
| tree | 4af69093c91b08d05876762129157f99011aee0f /fs | |
| parent | 9d03632e26e1a0a9e4a632cf426a7c0566768a7d (diff) | |
| download | op-kernel-dev-32d48fa1af1fe066a6a4798e6f5a50ac6a3ce4a3.zip op-kernel-dev-32d48fa1af1fe066a6a4798e6f5a50ac6a3ce4a3.tar.gz | |
Mask root object ID into f_fsid in btrfs_statfs()
Date: Mon, 18 Aug 2008 13:10:20 +0100
This means that subvolumes get a different fsid, and NFS exporting them
works properly.
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/btrfs/super.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index 6446ab7..55f4d00 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c @@ -503,6 +503,10 @@ static int btrfs_statfs(struct dentry *dentry, struct kstatfs *buf) on a big-endian or little-endian host */ buf->f_fsid.val[0] = be32_to_cpu(fsid[0]) ^ be32_to_cpu(fsid[2]); buf->f_fsid.val[1] = be32_to_cpu(fsid[1]) ^ be32_to_cpu(fsid[3]); + /* Mask in the root object ID too, to disambiguate subvols */ + buf->f_fsid.val[0] ^= BTRFS_I(dentry->d_inode)->root->objectid >> 32; + buf->f_fsid.val[1] ^= BTRFS_I(dentry->d_inode)->root->objectid; + return 0; } |
