Skip to contentSkip to conversation

GFS2: check and correct zero i_goal

PATCH New Abhi Das 2 participants 2 messages Sep 11, 2014 GFS2 file system

lore
Share & tools
lore

Abhi Das

author
#0 lore raw

PATCH 1/1 GFS2: check and correct zero i_goal

A GFS1->GFS2 converted filesystem can have the ip->i_goal field set to zero for inodes. This incorrect value results in -EBADSLT when the user attempts to allocate blocks to such inodes. This patch assigns the goal block to be the block address of the inode itself, which serves as a reasonable starting point for the allocation logic to find the next available block.

Resolves: rhbz#1130684

---
 fs/gfs2/glops.c | 3 +++
 1 file changed, 3 insertions(+)
fs/gfs2/glops.c +3 -0
index 2ffc67d..799427b 100644
@@ -349,6 +349,9 @@ static int gfs2_dinode_in(struct gfs2_inode *ip, const void *buf)
 	ip->i_inode.i_ctime.tv_nsec = be32_to_cpu(str->di_ctime_nsec);
 
 	ip->i_goal = be64_to_cpu(str->di_goal_meta);
+	if (!ip->i_goal) /* From a previous gfs2_convert, perhaps */
+		ip->i_goal = ip->i_no_addr;
+
 	ip->i_generation = be64_to_cpu(str->di_generation);
 
 	ip->i_diskflags = be32_to_cpu(str->di_flags);
Signature · 1 line
1.8.1.4
#1 lore raw

PATCH 1/1 GFS2: check and correct zero i_goal

Hi,

Quoted 18 lines · Abhi Das

A GFS1->GFS2 converted filesystem can have the ip->i_goal field set to zero for inodes. This incorrect value results in -EBADSLT when the user attempts to allocate blocks to such inodes. This patch assigns the goal block to be the block address of the inode itself, which serves as a reasonable starting point for the allocation logic to find the next available block.

Resolves: rhbz#1130684

---
  fs/gfs2/glops.c | 3 +++
  1 file changed, 3 insertions(+)
fs/gfs2/glops.c +0 -0
index 2ffc67d..799427b 100644

fs/gfs2/glops.c static int gfs2_dinode_in(struct gfs2_inode *ip, const void *buf) · line 357

Quoted 9 lines
fs/gfs2/glops.c +3 -0
@@ -349,6 +349,9 @@ static int gfs2_dinode_in(struct gfs2_inode *ip, const void *buf)
  	ip->i_inode.i_ctime.tv_nsec = be32_to_cpu(str->di_ctime_nsec);
 
  	ip->i_goal = be64_to_cpu(str->di_goal_meta);
+	if (!ip->i_goal) /* From a previous gfs2_convert, perhaps */
+		ip->i_goal = ip->i_no_addr;
+
  	ip->i_generation = be64_to_cpu(str->di_generation);
 
  	ip->i_diskflags = be32_to_cpu(str->di_flags);

I don't think that is the right place to make the change, since if the fs is read only then the in-kernel copy will be different to the on-disk copy of the inode. Better to catch the problem at block allocation time and use i_no_addr if i_goal is invalid then (and that doesn't just mean 0 - it might be pointing at another "impossible" block)

Steve.