Skip to contentSkip to conversation

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

PATCH In review Coly Li 3 participants 5 messages Jan 20, 2009 – Jan 27, 2009 JFS filesystem

lore
Share & tools
lore

Coly Li

author
#0 lore raw

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

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.

---
 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
#1 lore raw

Andrew,
Please take this version of the jfs patch, rather than the one you currently have in the -mm tree (fs-jfs-return-f_fsid-for-statfs2.patch).

Thanks,
Shaggy

Quoted 34 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.

---
 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
David Kleikamp
IBM Linux Technology Center
#2 lore raw
Quoted 3 lines · Dave Kleikamp

Andrew,
Please take this version of the jfs patch, rather than the one you currently have in the -mm tree (fs-jfs-return-f_fsid-for-statfs2.patch).

... or would you rather I handle it though the jfs tree and you drop it?

Shaggy

Quoted 35 lines · Coly Li
Quoted 34 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.

---
 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
David Kleikamp
IBM Linux Technology Center
#3 lore raw
Quoted 4 lines · On Tue, 27 Jan 2009 10:06:29 -0600 Dave Kleikamp <[email protected]>…
Quoted 3 lines · Dave Kleikamp

Andrew,
Please take this version of the jfs patch, rather than the one you currently have in the -mm tree (fs-jfs-return-f_fsid-for-statfs2.patch).

yep, I need to go lkml fishing for this.

Quoted 1 line

... or would you rather I handle it though the jfs tree and you drop it?

that would be preferable, thanks.

#4 lore raw
Quoted 7 lines · Andrew Morton
Quoted 4 lines · On Tue, 27 Jan 2009 10:06:29 -0600 Dave Kleikamp <[email protected]>…
Quoted 3 lines · Dave Kleikamp

Andrew,
Please take this version of the jfs patch, rather than the one you currently have in the -mm tree (fs-jfs-return-f_fsid-for-statfs2.patch).

Quoted 5 lines

yep, I need to go lkml fishing for this.

Quoted 1 line

... or would you rather I handle it though the jfs tree and you drop it?

that would be preferable, thanks.

Done

Shaggy

Signature · 2 lines
David Kleikamp
IBM Linux Technology Center