From e0e1826e4a8aaaf365148bea058c9d3b3d958f25 Mon Sep 17 00:00:00 2001 From: Coly Li Date: Thu, 2 Apr 2009 16:59:42 -0700 Subject: [PATCH] --- yaml --- r: 139767 b: refs/heads/master c: 2fc7f562b439a361c62b9d8a67733a164fb6136f h: refs/heads/master i: 139765: b6c34d3b5871263620e8308fbecee0eade895717 139763: c5244fcf69187b6a2d1ca62522454a4e29b4e41d 139759: 9b8a62bf0464c624fc55b3178f40c220b1746f15 v: v3 --- [refs] | 2 +- trunk/fs/squashfs/super.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 9991900d9207..8b3412b8fb8c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 651d0623045d3265a21ab9803b3a1e0f24a17461 +refs/heads/master: 2fc7f562b439a361c62b9d8a67733a164fb6136f diff --git a/trunk/fs/squashfs/super.c b/trunk/fs/squashfs/super.c index 681ec0d83799..ffa6edcd2d0c 100644 --- a/trunk/fs/squashfs/super.c +++ b/trunk/fs/squashfs/super.c @@ -301,6 +301,7 @@ static int squashfs_fill_super(struct super_block *sb, void *data, int silent) static int squashfs_statfs(struct dentry *dentry, struct kstatfs *buf) { struct squashfs_sb_info *msblk = dentry->d_sb->s_fs_info; + u64 id = huge_encode_dev(dentry->d_sb->s_bdev->bd_dev); TRACE("Entered squashfs_statfs\n"); @@ -311,6 +312,8 @@ static int squashfs_statfs(struct dentry *dentry, struct kstatfs *buf) buf->f_files = msblk->inodes; buf->f_ffree = 0; buf->f_namelen = SQUASHFS_NAME_LEN; + buf->f_fsid.val[0] = (u32)id; + buf->f_fsid.val[1] = (u32)(id >> 32); return 0; }