diff for duplicates of <20190814223542.GE101319@gmail.com> diff --git a/a/1.txt b/N1/1.txt index bd0a1eb..7cd948a 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,7 +1,8 @@ On Mon, Aug 12, 2019 at 08:06:44PM -0400, Theodore Y. Ts'o wrote: > > + /* Some inodes still reference this key; try to evict them. */ > > + if (try_to_lock_encrypted_files(sb, mk) != 0) -> > + status_flags |> > + FSCRYPT_KEY_REMOVAL_STATUS_FLAG_FILES_BUSY; +> > + status_flags |= +> > + FSCRYPT_KEY_REMOVAL_STATUS_FLAG_FILES_BUSY; > > + } > > try_to_lock_encrypted_files() can return other errors besides -EBUSY; @@ -46,8 +47,9 @@ index 9901593051424b..c3423f0edc7014 100644 /* Some inodes still reference this key; try to evict them. */ - if (try_to_lock_encrypted_files(sb, mk) != 0) + err = try_to_lock_encrypted_files(sb, mk); -+ if (err = -EBUSY) { - status_flags | FSCRYPT_KEY_REMOVAL_STATUS_FLAG_FILES_BUSY; ++ if (err == -EBUSY) { + status_flags |= + FSCRYPT_KEY_REMOVAL_STATUS_FLAG_FILES_BUSY; + err = 0; + } } @@ -58,8 +60,13 @@ index 9901593051424b..c3423f0edc7014 100644 */ key_put(key); - return put_user(status_flags, &uarg->removal_status_flags); -+ if (err = 0) ++ if (err == 0) + err = put_user(status_flags, &uarg->removal_status_flags); + return err; } EXPORT_SYMBOL_GPL(fscrypt_ioctl_remove_key); + + +______________________________________________________ +Linux MTD discussion mailing list +http://lists.infradead.org/mailman/listinfo/linux-mtd/ diff --git a/a/content_digest b/N1/content_digest index ba92285..74448e0 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,7 +3,7 @@ "ref\020190813000644.GH28705@mit.edu\0" "From\0Eric Biggers <ebiggers@kernel.org>\0" "Subject\0Re: [PATCH v8 10/20] fscrypt: add FS_IOC_REMOVE_ENCRYPTION_KEY ioctl\0" - "Date\0Wed, 14 Aug 2019 22:35:43 +0000\0" + "Date\0Wed, 14 Aug 2019 15:35:43 -0700\0" "To\0Theodore Y. Ts'o <tytso@mit.edu>\0" "Cc\0Satya Tangirala <satyat@google.com>" linux-api@vger.kernel.org @@ -21,7 +21,8 @@ "On Mon, Aug 12, 2019 at 08:06:44PM -0400, Theodore Y. Ts'o wrote:\n" "> > +\t\t/* Some inodes still reference this key; try to evict them. */\n" "> > +\t\tif (try_to_lock_encrypted_files(sb, mk) != 0)\n" - "> > +\t\t\tstatus_flags |> > +\t\t\t\tFSCRYPT_KEY_REMOVAL_STATUS_FLAG_FILES_BUSY;\n" + "> > +\t\t\tstatus_flags |=\n" + "> > +\t\t\t\tFSCRYPT_KEY_REMOVAL_STATUS_FLAG_FILES_BUSY;\n" "> > +\t}\n" "> \n" "> try_to_lock_encrypted_files() can return other errors besides -EBUSY;\n" @@ -66,8 +67,9 @@ " \t\t/* Some inodes still reference this key; try to evict them. */\n" "-\t\tif (try_to_lock_encrypted_files(sb, mk) != 0)\n" "+\t\terr = try_to_lock_encrypted_files(sb, mk);\n" - "+\t\tif (err = -EBUSY) {\n" - " \t\t\tstatus_flags | \t\t\t\tFSCRYPT_KEY_REMOVAL_STATUS_FLAG_FILES_BUSY;\n" + "+\t\tif (err == -EBUSY) {\n" + " \t\t\tstatus_flags |=\n" + " \t\t\t\tFSCRYPT_KEY_REMOVAL_STATUS_FLAG_FILES_BUSY;\n" "+\t\t\terr = 0;\n" "+\t\t}\n" " \t}\n" @@ -78,10 +80,15 @@ " \t */\n" " \tkey_put(key);\n" "-\treturn put_user(status_flags, &uarg->removal_status_flags);\n" - "+\tif (err = 0)\n" + "+\tif (err == 0)\n" "+\t\terr = put_user(status_flags, &uarg->removal_status_flags);\n" "+\treturn err;\n" " }\n" - EXPORT_SYMBOL_GPL(fscrypt_ioctl_remove_key); + " EXPORT_SYMBOL_GPL(fscrypt_ioctl_remove_key);\n" + " \n" + "\n" + "______________________________________________________\n" + "Linux MTD discussion mailing list\n" + http://lists.infradead.org/mailman/listinfo/linux-mtd/ -bab3c0cb8b44bc01b0e08fffc4a4227984794afefdceadc8035a6eadcc0f678d +f52e8368631587a2ab756fd4d7091ef7fe85a539d248f7dd8f65822318e67687
diff --git a/a/1.txt b/N2/1.txt index bd0a1eb..53d977c 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,7 +1,8 @@ On Mon, Aug 12, 2019 at 08:06:44PM -0400, Theodore Y. Ts'o wrote: > > + /* Some inodes still reference this key; try to evict them. */ > > + if (try_to_lock_encrypted_files(sb, mk) != 0) -> > + status_flags |> > + FSCRYPT_KEY_REMOVAL_STATUS_FLAG_FILES_BUSY; +> > + status_flags |= +> > + FSCRYPT_KEY_REMOVAL_STATUS_FLAG_FILES_BUSY; > > + } > > try_to_lock_encrypted_files() can return other errors besides -EBUSY; @@ -46,8 +47,9 @@ index 9901593051424b..c3423f0edc7014 100644 /* Some inodes still reference this key; try to evict them. */ - if (try_to_lock_encrypted_files(sb, mk) != 0) + err = try_to_lock_encrypted_files(sb, mk); -+ if (err = -EBUSY) { - status_flags | FSCRYPT_KEY_REMOVAL_STATUS_FLAG_FILES_BUSY; ++ if (err == -EBUSY) { + status_flags |= + FSCRYPT_KEY_REMOVAL_STATUS_FLAG_FILES_BUSY; + err = 0; + } } @@ -58,7 +60,7 @@ index 9901593051424b..c3423f0edc7014 100644 */ key_put(key); - return put_user(status_flags, &uarg->removal_status_flags); -+ if (err = 0) ++ if (err == 0) + err = put_user(status_flags, &uarg->removal_status_flags); + return err; } diff --git a/a/content_digest b/N2/content_digest index ba92285..41c3955 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -3,25 +3,26 @@ "ref\020190813000644.GH28705@mit.edu\0" "From\0Eric Biggers <ebiggers@kernel.org>\0" "Subject\0Re: [PATCH v8 10/20] fscrypt: add FS_IOC_REMOVE_ENCRYPTION_KEY ioctl\0" - "Date\0Wed, 14 Aug 2019 22:35:43 +0000\0" + "Date\0Wed, 14 Aug 2019 15:35:43 -0700\0" "To\0Theodore Y. Ts'o <tytso@mit.edu>\0" - "Cc\0Satya Tangirala <satyat@google.com>" - linux-api@vger.kernel.org + "Cc\0linux-fscrypt@vger.kernel.org" + linux-ext4@vger.kernel.org linux-f2fs-devel@lists.sourceforge.net - linux-fscrypt@vger.kernel.org - keyrings@vger.kernel.org linux-mtd@lists.infradead.org - linux-crypto@vger.kernel.org linux-fsdevel@vger.kernel.org - Jaegeuk Kim <jaegeuk@kernel.org> - linux-ext4@vger.kernel.org - " Paul Crowley <paulcrowley@google.com>\0" + linux-crypto@vger.kernel.org + keyrings@vger.kernel.org + linux-api@vger.kernel.org + Satya Tangirala <satyat@google.com> + Paul Crowley <paulcrowley@google.com> + " Jaegeuk Kim <jaegeuk@kernel.org>\0" "\00:1\0" "b\0" "On Mon, Aug 12, 2019 at 08:06:44PM -0400, Theodore Y. Ts'o wrote:\n" "> > +\t\t/* Some inodes still reference this key; try to evict them. */\n" "> > +\t\tif (try_to_lock_encrypted_files(sb, mk) != 0)\n" - "> > +\t\t\tstatus_flags |> > +\t\t\t\tFSCRYPT_KEY_REMOVAL_STATUS_FLAG_FILES_BUSY;\n" + "> > +\t\t\tstatus_flags |=\n" + "> > +\t\t\t\tFSCRYPT_KEY_REMOVAL_STATUS_FLAG_FILES_BUSY;\n" "> > +\t}\n" "> \n" "> try_to_lock_encrypted_files() can return other errors besides -EBUSY;\n" @@ -66,8 +67,9 @@ " \t\t/* Some inodes still reference this key; try to evict them. */\n" "-\t\tif (try_to_lock_encrypted_files(sb, mk) != 0)\n" "+\t\terr = try_to_lock_encrypted_files(sb, mk);\n" - "+\t\tif (err = -EBUSY) {\n" - " \t\t\tstatus_flags | \t\t\t\tFSCRYPT_KEY_REMOVAL_STATUS_FLAG_FILES_BUSY;\n" + "+\t\tif (err == -EBUSY) {\n" + " \t\t\tstatus_flags |=\n" + " \t\t\t\tFSCRYPT_KEY_REMOVAL_STATUS_FLAG_FILES_BUSY;\n" "+\t\t\terr = 0;\n" "+\t\t}\n" " \t}\n" @@ -78,10 +80,10 @@ " \t */\n" " \tkey_put(key);\n" "-\treturn put_user(status_flags, &uarg->removal_status_flags);\n" - "+\tif (err = 0)\n" + "+\tif (err == 0)\n" "+\t\terr = put_user(status_flags, &uarg->removal_status_flags);\n" "+\treturn err;\n" " }\n" EXPORT_SYMBOL_GPL(fscrypt_ioctl_remove_key); -bab3c0cb8b44bc01b0e08fffc4a4227984794afefdceadc8035a6eadcc0f678d +66606eddd64198e7a2c662c804b847ec524a7912ad68fedb143698dd9d9832fb
diff --git a/a/1.txt b/N3/1.txt index bd0a1eb..3b20b20 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -1,7 +1,8 @@ On Mon, Aug 12, 2019 at 08:06:44PM -0400, Theodore Y. Ts'o wrote: > > + /* Some inodes still reference this key; try to evict them. */ > > + if (try_to_lock_encrypted_files(sb, mk) != 0) -> > + status_flags |> > + FSCRYPT_KEY_REMOVAL_STATUS_FLAG_FILES_BUSY; +> > + status_flags |= +> > + FSCRYPT_KEY_REMOVAL_STATUS_FLAG_FILES_BUSY; > > + } > > try_to_lock_encrypted_files() can return other errors besides -EBUSY; @@ -46,8 +47,9 @@ index 9901593051424b..c3423f0edc7014 100644 /* Some inodes still reference this key; try to evict them. */ - if (try_to_lock_encrypted_files(sb, mk) != 0) + err = try_to_lock_encrypted_files(sb, mk); -+ if (err = -EBUSY) { - status_flags | FSCRYPT_KEY_REMOVAL_STATUS_FLAG_FILES_BUSY; ++ if (err == -EBUSY) { + status_flags |= + FSCRYPT_KEY_REMOVAL_STATUS_FLAG_FILES_BUSY; + err = 0; + } } @@ -58,8 +60,15 @@ index 9901593051424b..c3423f0edc7014 100644 */ key_put(key); - return put_user(status_flags, &uarg->removal_status_flags); -+ if (err = 0) ++ if (err == 0) + err = put_user(status_flags, &uarg->removal_status_flags); + return err; } EXPORT_SYMBOL_GPL(fscrypt_ioctl_remove_key); + + + +_______________________________________________ +Linux-f2fs-devel mailing list +Linux-f2fs-devel@lists.sourceforge.net +https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel diff --git a/a/content_digest b/N3/content_digest index ba92285..308cc47 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -2,8 +2,8 @@ "ref\020190805162521.90882-11-ebiggers@kernel.org\0" "ref\020190813000644.GH28705@mit.edu\0" "From\0Eric Biggers <ebiggers@kernel.org>\0" - "Subject\0Re: [PATCH v8 10/20] fscrypt: add FS_IOC_REMOVE_ENCRYPTION_KEY ioctl\0" - "Date\0Wed, 14 Aug 2019 22:35:43 +0000\0" + "Subject\0Re: [f2fs-dev] [PATCH v8 10/20] fscrypt: add FS_IOC_REMOVE_ENCRYPTION_KEY ioctl\0" + "Date\0Wed, 14 Aug 2019 15:35:43 -0700\0" "To\0Theodore Y. Ts'o <tytso@mit.edu>\0" "Cc\0Satya Tangirala <satyat@google.com>" linux-api@vger.kernel.org @@ -21,7 +21,8 @@ "On Mon, Aug 12, 2019 at 08:06:44PM -0400, Theodore Y. Ts'o wrote:\n" "> > +\t\t/* Some inodes still reference this key; try to evict them. */\n" "> > +\t\tif (try_to_lock_encrypted_files(sb, mk) != 0)\n" - "> > +\t\t\tstatus_flags |> > +\t\t\t\tFSCRYPT_KEY_REMOVAL_STATUS_FLAG_FILES_BUSY;\n" + "> > +\t\t\tstatus_flags |=\n" + "> > +\t\t\t\tFSCRYPT_KEY_REMOVAL_STATUS_FLAG_FILES_BUSY;\n" "> > +\t}\n" "> \n" "> try_to_lock_encrypted_files() can return other errors besides -EBUSY;\n" @@ -66,8 +67,9 @@ " \t\t/* Some inodes still reference this key; try to evict them. */\n" "-\t\tif (try_to_lock_encrypted_files(sb, mk) != 0)\n" "+\t\terr = try_to_lock_encrypted_files(sb, mk);\n" - "+\t\tif (err = -EBUSY) {\n" - " \t\t\tstatus_flags | \t\t\t\tFSCRYPT_KEY_REMOVAL_STATUS_FLAG_FILES_BUSY;\n" + "+\t\tif (err == -EBUSY) {\n" + " \t\t\tstatus_flags |=\n" + " \t\t\t\tFSCRYPT_KEY_REMOVAL_STATUS_FLAG_FILES_BUSY;\n" "+\t\t\terr = 0;\n" "+\t\t}\n" " \t}\n" @@ -78,10 +80,17 @@ " \t */\n" " \tkey_put(key);\n" "-\treturn put_user(status_flags, &uarg->removal_status_flags);\n" - "+\tif (err = 0)\n" + "+\tif (err == 0)\n" "+\t\terr = put_user(status_flags, &uarg->removal_status_flags);\n" "+\treturn err;\n" " }\n" - EXPORT_SYMBOL_GPL(fscrypt_ioctl_remove_key); + " EXPORT_SYMBOL_GPL(fscrypt_ioctl_remove_key);\n" + " \n" + "\n" + "\n" + "_______________________________________________\n" + "Linux-f2fs-devel mailing list\n" + "Linux-f2fs-devel@lists.sourceforge.net\n" + https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel -bab3c0cb8b44bc01b0e08fffc4a4227984794afefdceadc8035a6eadcc0f678d +c9411b64cade94315ff595f523b5f67d6b03a1f9c4c77aa2093f225c4e368637
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.