Skip to contentSkip to conversation

fs/jfs: return f_fsid for statfs(2), v2

PATCH In review Coly Li 2 participants 3 messages Jan 20, 2009 JFS filesystem

lore
Share & tools
lore

Coly Li

author
#0 lore raw

PATCH 11/20 fs/jfs: return f_fsid for statfs(2), v2

This patch makes jfs return f_fsid info for statfs(2). By Andreas' suggestion, this patch populates a persistent f_fsid between boots/mounts with help of on-disk uuid record.

Cc Dave Kleikamp <[email protected]>
---
 fs/jfs/super.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
fs/jfs/super.c +5 -1
index b37d1f7..6ce1aac 100644
@@ -29,6 +29,7 @@
 #include <linux/posix_acl.h>
 #include <linux/buffer_head.h>
 #include <linux/exportfs.h>
+#include <linux/crc32.h>
 #include <asm/uaccess.h>
 #include <linux/seq_file.h>
 
@@ -168,7 +169,10 @@ static int jfs_statfs(struct dentry *dentry, struct kstatfs *buf)
 	buf->f_files = maxinodes;
 	buf->f_ffree = maxinodes - (atomic_read(&imap->im_numinos) -
 				    atomic_read(&imap->im_numfree));
-
+	buf->f_fsid.val[0] = (u32)crc32_le(0, sbi->uuid, sizeof(sbi->uuid)/2);
+	buf->f_fsid.val[1] = (u32)crc32_le(0, sbi->uuid + sizeof(sbi->uuid)/2,
+					sizeof(sbi->uuid)/2);
+	
 	buf->f_namelen = JFS_NAME_MAX;
 	return 0;
 }
Signature · 2 lines
Coly Li
SuSE Labs
Acked-by on v1 11/20
#1 lore raw

One minor nit...

Quoted 4 lines · Coly Li

This patch makes jfs return f_fsid info for statfs(2). By Andreas' suggestion, this patch populates a persistent f_fsid between boots/mounts with help of on-disk uuid record.

Quoted 17 lines
---
 fs/jfs/super.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
fs/jfs/super.c +1 -0
index b37d1f7..6ce1aac 100644
@@ -29,6 +29,7 @@
 #include <linux/posix_acl.h>
 #include <linux/buffer_head.h>
 #include <linux/exportfs.h>
+#include <linux/crc32.h>
 #include <asm/uaccess.h>
 #include <linux/seq_file.h>
 

fs/jfs/super.c static int jfs_statfs(struct dentry *dentry, struct kstatfs *buf) · line 175

Quoted 8 lines
fs/jfs/super.c +4 -1
@@ -168,7 +169,10 @@ static int jfs_statfs(struct dentry *dentry, struct kstatfs *buf)
 	buf->f_files = maxinodes;
 	buf->f_ffree = maxinodes - (atomic_read(&imap->im_numinos) -
 				    atomic_read(&imap->im_numfree));
-
+	buf->f_fsid.val[0] = (u32)crc32_le(0, sbi->uuid, sizeof(sbi->uuid)/2);
+	buf->f_fsid.val[1] = (u32)crc32_le(0, sbi->uuid + sizeof(sbi->uuid)/2,
+					sizeof(sbi->uuid)/2);
+	

checkpatch.pl points out a trailing tab here

Quoted 4 lines
fs/jfs/super.c +0 -0
 	buf->f_namelen = JFS_NAME_MAX;
 	return 0;
 }
Signature · 2 lines
David Kleikamp
IBM Linux Technology Center
author
#2 lore raw

Dave Kleikamp Wrote:

Quoted 2 lines

One minor nit...

Yeah, if there is no other device preempts major device number, it's almost no difference to huge_encode_dev() method in common cases. Anyway, using uuid a little better than v1 :)

Quoted 24 lines · Coly Li
Quoted 4 lines

This patch makes jfs return f_fsid info for statfs(2). By Andreas' suggestion, this patch populates a persistent f_fsid between boots/mounts with help of on-disk uuid record.

Quoted 16 lines
---
 fs/jfs/super.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
fs/jfs/super.c +1 -0
index b37d1f7..6ce1aac 100644
@@ -29,6 +29,7 @@
 #include <linux/posix_acl.h>
 #include <linux/buffer_head.h>
 #include <linux/exportfs.h>
+#include <linux/crc32.h>
 #include <asm/uaccess.h>
 #include <linux/seq_file.h>
 
Quoted 12 lines

fs/jfs/super.c static int jfs_statfs(struct dentry *dentry, struct kstatfs *buf) · line 175

Quoted 9 lines
fs/jfs/super.c +4 -1
@@ -168,7 +169,10 @@ static int jfs_statfs(struct dentry *dentry, struct kstatfs *buf)
 	buf->f_files = maxinodes;
 	buf->f_ffree = maxinodes - (atomic_read(&imap->im_numinos) -
 				    atomic_read(&imap->im_numfree));
-
+	buf->f_fsid.val[0] = (u32)crc32_le(0, sbi->uuid, sizeof(sbi->uuid)/2);
+	buf->f_fsid.val[1] = (u32)crc32_le(0, sbi->uuid + sizeof(sbi->uuid)/2,
+					sizeof(sbi->uuid)/2);
+	

checkpatch.pl points out a trailing tab here

Oops, thanks for pointing out this. I will send out v3 and add your Acked-By in the patch.

Thanks for review.

Signature · 2 lines
Coly Li
SuSE Labs