Skip to contentSkip to conversation

befs (1/5): LBD support

PATCH In review Sergey S. Kostyliov 4 participants 8 messages May 13, 2004 – May 14, 2004

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 befs (1/5): LBD support

LBD patch merged long time ago, so it is safe to pass u64 block numbers to sb_bread() when sector_t is large enough.

===== fs/befs/linuxvfs.c 1.17 vs edited =====

fs/befs/linuxvfs.c +7 -0
@@ -856,6 +856,13 @@
 	if (befs_check_sb(sb) != BEFS_OK)
 		goto unaquire_priv_sbp;
 
+	if( befs_sb->num_blocks > ~((sector_t)0) ) {
+		befs_error(sb, "blocks count: %Lu "
+			"is larger than the host can use",
+			befs_sb->num_blocks);
+		goto unaquire_priv_sbp;
+	}
+
 	/*
 	 * set up enough so that it can read an inode
 	 * Fill in kernel superblock fields from private sb

===== fs/befs/befs.h 1.1 vs edited =====

fs/befs/befs.h +0 -3
@@ -14,10 +14,7 @@
 #define BEFS_VERSION "0.9.3"
 
 
-/* Sector_t makes this sillyness obsolete */
 typedef u64 befs_blocknr_t;
-typedef u32 vfs_blocknr_t;
-
 /*
  * BeFS in memory structures
  */

===== fs/befs/io.c 1.1 vs edited =====

fs/befs/io.c +3 -18
@@ -28,7 +28,6 @@
 {
 	struct buffer_head *bh = NULL;
 	befs_blocknr_t block = 0;
-	vfs_blocknr_t vfs_block = 0;
 	befs_sb_info *befs_sb = BEFS_SB(sb);
 
 	befs_debug(sb, "---> Enter befs_read_iaddr() "
@@ -42,17 +41,10 @@
 	}
 
 	block = iaddr2blockno(sb, &iaddr);
-	vfs_block = (vfs_blocknr_t) block;
-
-	if (vfs_block != block) {
-		befs_error(sb, "Error converting to host blocknr_t. %Lu "
-			   "is larger than the host can use", block);
-		goto error;
-	}
 
 	befs_debug(sb, "befs_read_iaddr: offset = %lu", block);
 
-	bh = sb_bread(sb, vfs_block);
+	bh = sb_bread(sb, block);
 
 	if (bh == NULL) {
 		befs_error(sb, "Failed to read block %lu", block);
@@ -71,20 +63,13 @@
 befs_bread(struct super_block *sb, befs_blocknr_t block)
 {
 	struct buffer_head *bh = NULL;
-	vfs_blocknr_t vfs_block = (vfs_blocknr_t) block;
 
 	befs_debug(sb, "---> Enter befs_read() %Lu", block);
 
-	if (vfs_block != block) {
-		befs_error(sb, "Error converting to host blocknr_t. %Lu "
-			   "is larger than the host can use", block);
-		goto error;
-	}
-
-	bh = sb_bread(sb, vfs_block);
+	bh = sb_bread(sb, block);
 
 	if (bh == NULL) {
-		befs_error(sb, "Failed to read block %lu", vfs_block);
+		befs_error(sb, "Failed to read block %lu", block);
 		goto error;
 	}
 
Signature · 3 lines
                   Best regards,
                   Sergey S. Kostyliov <[email protected]>
                   Public PGP key: http://sysadminday.org.ru/rathamahata.asc
#1 lore raw
Quoted 2 lines · Sergey S. Kostyliov

fs/befs/linuxvfs.c

Wow, BeFS maintenance.

Are you regularly testing BeFS? If so, do you think it still deserves to be labelled "experimental"?

#2 lore raw
Quoted 8 lines · Andrew Morton
Quoted 2 lines · Sergey S. Kostyliov

fs/befs/linuxvfs.c

Wow, BeFS maintenance.

Are you regularly testing BeFS? If so, do you think it still deserves to be labelled "experimental"?

Yes, I'm trying to test BeFS regularly.

Quoted 3 lines

From my experience the current read only driver is fairly stable.

Signature · 3 lines
                   Best regards,
                   Sergey S. Kostyliov <[email protected]>
                   Public PGP key: http://sysadminday.org.ru/rathamahata.asc
#3 lore raw
In reply to Sergey S. Kostyliov
Quoted 2 lines · Sergey S. Kostyliov

LBD patch merged long time ago, so it is safe to pass u64 block numbers to sb_bread() when sector_t is large enough.

Nice. I haven't mounted any of my BeFS volumes in quite some months now.
Are you interested in taking over official maintainership?

Signature · 2 lines
Will Dyson
"Back off man, I'm a scientist!" -Dr. Peter Venkman
#4 lore raw

Hello Will,

Quoted 7 lines · Will Dyson
Quoted 2 lines · Sergey S. Kostyliov

LBD patch merged long time ago, so it is safe to pass u64 block numbers to sb_bread() when sector_t is large enough.

Nice. I haven't mounted any of my BeFS volumes in quite some months now.
Are you interested in taking over official maintainership?

Yes, I am interested. How do you like this patch?

===== Documentation/filesystems/befs.txt 1.2 vs edited =====

Documentation/filesystems/befs.txt +4 -2
@@ -17,8 +17,8 @@
 
 AUTHOR
 =====
-Current maintainer: Will Dyson <[email protected]>
-Has been working on the code since Aug 13, 2001. See the changelog for
+The largest part of the code written by Will Dyson <[email protected]>
+He has been working on the code since Aug 13, 2001. See the changelog for
 details.
 
 Original Author: Makoto Kato <[email protected]>
@@ -26,6 +26,8 @@
 <http://hp.vector.co.jp/authors/VA008030/bfs/>
 Does anyone know of a more current email address for Makoto? He doesn't
 respond to the address given above...
+
+Current maintainer: Sergey S. Kostyliov <[email protected]>
 
 WHAT IS THIS DRIVER?
 ==================
Signature · 3 lines
                   Best regards,
                   Sergey S. Kostyliov <[email protected]>
                   Public PGP key: http://sysadminday.org.ru/rathamahata.asc
#5 lore raw
Quoted 5 lines · Sergey S. Kostyliov
Quoted 3 lines

Nice. I haven't mounted any of my BeFS volumes in quite some months now.
Are you interested in taking over official maintainership?

Yes, I am interested. How do you like this patch?

Thats fine with me.

#6 lore raw
In reply to Sergey S. Kostyliov
Quoted 5 lines · Sergey S. Kostyliov
Quoted 2 lines · Will Dyson

Are you interested in taking over official maintainership?

Yes, I am interested. How do you like this patch?

Good to know. How do you like this patch?

Jörn

Signature · 25 lines
A quarrel is quickly settled when deserted by one party; there is
no battle unless there be two.
-- Seneca


Simply thinko:
inode->i_flags should never contain fs-specific flags.  In fact, it doesn't;
the checks against it cause "chattr +T" to be useless for ext[23].  Same
bug was in befs as well.

 linuxvfs.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)


--- linux-2.6.5cow/fs/befs/linuxvfs.c~befs_inode_flags	2004-04-27 16:34:51.000000000 +0200
+++ linux-2.6.5cow/fs/befs/linuxvfs.c	2004-04-27 16:48:54.000000000 +0200
@@ -376,7 +376,7 @@
 	befs_ino->i_attribute = fsrun_to_cpu(sb, raw_inode->attributes);
 	befs_ino->i_flags = fs32_to_cpu(sb, raw_inode->flags);
 
-	if (S_ISLNK(inode->i_mode) && !(inode->i_flags & BEFS_LONG_SYMLINK)) {
+	if (S_ISLNK(inode->i_mode) && !(befs_ino->i_flags & BEFS_LONG_SYMLINK)){
 		inode->i_size = 0;
 		inode->i_blocks = befs_sb->block_size / VFS_BLOCK_SIZE;
 		strncpy(befs_ino->i_data.symlink, raw_inode->data.symlink,
#7 lore raw
Quoted 8 lines · Jörn Engel
Quoted 5 lines · Sergey S. Kostyliov
Quoted 2 lines · Will Dyson

  Are you interested in taking over official maintainership?

Yes, I am interested. How do you like this patch?

Good to know.  How do you like this patch?

This one seems obviously correct. Applied. Thank you!

Signature · 3 lines
                   Best regards,
                   Sergey S. Kostyliov <[email protected]>
                   Public PGP key: http://sysadminday.org.ru/rathamahata.asc