summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorArtem Bityutskiy <Artem.Bityutskiy@nokia.com>2008-09-03 14:16:42 +0300
committerArtem Bityutskiy <Artem.Bityutskiy@nokia.com>2008-09-03 14:56:22 +0300
commit7c7cbadf7341a0792879c67d6e3020f040d6cd7f (patch)
tree845a25a3bcf44f8ce5331d4b03758c9538dde92f /fs
parentb3385c278d3c32aec68d4900b35bc07df1b2240c (diff)
downloadlinux-stable-7c7cbadf7341a0792879c67d6e3020f040d6cd7f.tar.gz
linux-stable-7c7cbadf7341a0792879c67d6e3020f040d6cd7f.tar.bz2
linux-stable-7c7cbadf7341a0792879c67d6e3020f040d6cd7f.zip
UBIFS: amend f_fsid
David Woodhouse suggested to be consistent with other FSes and xor the beginning and the end of the UUID. Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/ubifs/super.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c
index 0dee4042c6c5..7562464ac83f 100644
--- a/fs/ubifs/super.c
+++ b/fs/ubifs/super.c
@@ -370,6 +370,7 @@ static int ubifs_statfs(struct dentry *dentry, struct kstatfs *buf)
{
struct ubifs_info *c = dentry->d_sb->s_fs_info;
unsigned long long free;
+ __le32 *uuid = (__le32 *)c->uuid;
free = ubifs_get_free_space(c);
dbg_gen("free space %lld bytes (%lld blocks)",
@@ -386,8 +387,8 @@ static int ubifs_statfs(struct dentry *dentry, struct kstatfs *buf)
buf->f_files = 0;
buf->f_ffree = 0;
buf->f_namelen = UBIFS_MAX_NLEN;
- memcpy(&buf->f_fsid, c->uuid, sizeof(__kernel_fsid_t));
-
+ buf->f_fsid.val[0] = le32_to_cpu(uuid[0]) ^ le32_to_cpu(uuid[2]);
+ buf->f_fsid.val[1] = le32_to_cpu(uuid[1]) ^ le32_to_cpu(uuid[3]);
return 0;
}