On Monday, November 26, 2018 11:04:35 PM IST Theodore Y. Ts'o wrote: > On Sun, Nov 25, 2018 at 11:00:38PM -0500, Theodore Y. Ts'o wrote: > > > > It might be that the simplest way to solve things is to merge the f2fs > > dev branch up to 79c66e75720c. This will have the net effect of > > including the five patches listed above onto the fscrypt git tree. So > > long you don't plan to rebase or otherwise change these five patches, > > it should avoid any merge conflicts. > > I've set up a git branch which has the f2fs dev branch, 4.20-rc4, the > fsverity patches, and part of Chandan's patch series here: > > git://git.kernel.org/pub/scm/linux/kernel/git/tytso/fscrypt.git test-working > > There is a minor conflict when I did a trial merge with f2fs.git's dev > branch, but it's pretty obvious to how to resolve it. > > Jaegeuk, Eric, Chandan, please take a look and let me know what you > think. Ted, I have addressed the review comments provided by Eric. Hence three out of the four patches in the test-working branch have new changes. I also got UBIFS to use CONFIG_FS_ENCRYPTION instead of the per-filesystem config symbol. I am currently executing fstests to verify the changes. Eric, When executing generic/900, I noticed that sometimes xfs_io would get stuck for an indefinite period. /proc/<pid of xfs_io>/stack showed that the task was stuck in tty_read() inside the kernel. The following change fixed it, diff --git a/tests/generic/900 b/tests/generic/900 index 290889ce..0831eed4 100755 --- a/tests/generic/900 +++ b/tests/generic/900 @@ -83,7 +83,7 @@ _fsv_create_enable_file $fsv_file >> $seqres.full echo "* reading" $XFS_IO_PROG -r $fsv_file -c '' echo "* xfs_io writing, should be O_RDWR" -$XFS_IO_PROG $fsv_file |& _filter_scratch +$XFS_IO_PROG -c '' $fsv_file 2>&1 | _filter_scratch echo "* bash >>, should be O_APPEND" bash -c "echo >> $fsv_file" |& _filter_scratch echo "* bash >, should be O_WRONLY|O_CREAT|O_TRUNC" xfs_io gets into interactive mode when invoked without a "-c cmd" string. However, I am not able recreate the scenario once again without the above changes applied. I am not sure about what changed. -- chandan
