Skip to contentSkip to conversation

fsstack: Remove inode copy

PATCH In review Michael Halcrow 2 participants 2 messages Dec 15, 2006 VFS

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fsstack: Remove inode copy

Trevor found a file size problem in eCryptfs in recent kernels, and he tracked it down to an fsstack change.

This was the eCryptfs copy_attr_all:

Review

Quoted 13 lines
(quoted diff) +0 -13
-void ecryptfs_copy_attr_all(struct inode *dest, const struct inode *src)
-{
-       dest->i_mode = src->i_mode;
-       dest->i_nlink = src->i_nlink;
-       dest->i_uid = src->i_uid;
-       dest->i_gid = src->i_gid;
-       dest->i_rdev = src->i_rdev;
-       dest->i_atime = src->i_atime;
-       dest->i_mtime = src->i_mtime;
-       dest->i_ctime = src->i_ctime;
-       dest->i_blkbits = src->i_blkbits;
-       dest->i_flags = src->i_flags;
-}

This is the fsstack copy_attr_all:

Quoted 10 lines
(quoted diff) +10 -0
+void fsstack_copy_attr_all(struct inode *dest, const struct inode *src,
+                               int (*get_nlinks)(struct inode *))
+{
+       if (!get_nlinks)
+               dest->i_nlink = src->i_nlink;
+       else
+               dest->i_nlink = (*get_nlinks)(dest);
+
+       dest->i_mode = src->i_mode;
+       dest->i_uid = src->i_uid;

Review

Quoted 10 lines
(quoted diff) +10 -0
+       dest->i_gid = src->i_gid;
+       dest->i_rdev = src->i_rdev;
+       dest->i_atime = src->i_atime;
+       dest->i_mtime = src->i_mtime;
+       dest->i_ctime = src->i_ctime;
+       dest->i_blkbits = src->i_blkbits;
+       dest->i_flags = src->i_flags;
+
+       fsstack_copy_inode_size(dest, src);
+}

The addition of copy_inode_size breaks eCryptfs, since eCryptfs needs to interpolate the file sizes (eCryptfs has extra space in the lower file for the header). The setting of the upper inode size occurs elsewhere in eCryptfs, and the new copy_attr_all now undoes what eCryptfs was doing right beforehand.

I see three ways of going forward from here. (1) Something like this patch needs to go in (assuming it jives with Unionfs), (2) we need to make a change to the fsstack API for more fine-grained control over copying attributes (e.g., by also including a callback function for calculating the right file size, which will require some more work on both eCryptfs and Unionfs), or (3) the fsstack patch on eCryptfs (commit 0cc72dc7f050188d8d7344b1dd688cbc68d3cd30 made on Fri Dec 8 02:36:31 2006 -0800) needs to be yanked in 2.6.20.

I think the simplest solution, from eCryptfs' perspective, is to just remove the inode size copy. Jeff, please let me know if this approach will work for you, or let me know if you have another idea.

Thanks,
Mike

---

Remove inode size copy in general fsstack attr copy code. Stacked filesystems may need to interpolate the inode size, since the file size in the lower file may be different than the file size in the stacked layer.

---

 fs/stack.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

97582cdc0c45a37fb75488a96b02995a7b28364d

fs/stack.c +0 -2
index 5ddbc34..8ffb880 100644
@@ -34,7 +34,5 @@ void fsstack_copy_attr_all(struct inode 
 	dest->i_ctime = src->i_ctime;
 	dest->i_blkbits = src->i_blkbits;
 	dest->i_flags = src->i_flags;
-
-	fsstack_copy_inode_size(dest, src);
 }
 EXPORT_SYMBOL_GPL(fsstack_copy_attr_all);
Signature · 1 line
1.3.3
Acked-by Josef "Jeff" Sipek on v1 1/1
#1 lore raw
Quoted 5 lines · Michael Halcrow

The addition of copy_inode_size breaks eCryptfs, since eCryptfs needs to interpolate the file sizes (eCryptfs has extra space in the lower file for the header). The setting of the upper inode size occurs elsewhere in eCryptfs, and the new copy_attr_all now undoes what eCryptfs was doing right beforehand.

...

Quoted 3 lines

I think the simplest solution, from eCryptfs' perspective, is to just remove the inode size copy. Jeff, please let me know if this approach will work for you, or let me know if you have another idea.

That's alright. fsstack is supposed to be as generic as possible. I think that removing the inode size copy make it more generic.

Quoted 6 lines

Remove inode size copy in general fsstack attr copy code. Stacked filesystems may need to interpolate the inode size, since the file size in the lower file may be different than the file size in the stacked layer.

Josef "Jeff" Sipek.

Signature · 1 line
Don't drink and derive. Alcohol and algebra don't mix.