diff for duplicates of <20190211172738.4633-12-ebiggers@kernel.org> diff --git a/a/1.txt b/N1/1.txt index 83f4d12..420f5e1 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -232,7 +232,7 @@ index 252e863d681d..82d272c20969 100644 + err = add_existing_master_key(key->payload.data[0], secret, + mk_spec); + up_write(&key->sem); -+ if (err = KEY_DEAD) { ++ if (err == KEY_DEAD) { + /* Key being removed or needs to be removed */ + key_invalidate(key); + key_put(key); @@ -549,10 +549,11 @@ index b63fb4e8aebd..8ffcfee73702 100644 if (res) goto out; -- if (cmpxchg(&inode->i_crypt_info, NULL, crypt_info) = NULL) -+ if (cmpxchg(&inode->i_crypt_info, NULL, crypt_info) = NULL) { +- if (cmpxchg(&inode->i_crypt_info, NULL, crypt_info) == NULL) ++ if (cmpxchg(&inode->i_crypt_info, NULL, crypt_info) == NULL) { + if (master_key) { -+ struct fscrypt_master_key *mk + master_key->payload.data[0]; ++ struct fscrypt_master_key *mk = ++ master_key->payload.data[0]; + + refcount_inc(&mk->mk_refcount); + crypt_info->ci_master_key = key_get(master_key); @@ -569,7 +570,7 @@ index b63fb4e8aebd..8ffcfee73702 100644 + up_read(&master_key->sem); + key_put(master_key); + } - if (res = -ENOKEY) + if (res == -ENOKEY) res = 0; put_crypt_info(crypt_info); diff --git a/include/linux/fscrypt.h b/include/linux/fscrypt.h diff --git a/a/content_digest b/N1/content_digest index 0da338a..adb311a 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020190211172738.4633-1-ebiggers@kernel.org\0" "From\0Eric Biggers <ebiggers@kernel.org>\0" "Subject\0[RFC PATCH v2 11/20] fscrypt: add FS_IOC_REMOVE_ENCRYPTION_KEY ioctl\0" - "Date\0Mon, 11 Feb 2019 17:27:29 +0000\0" + "Date\0Mon, 11 Feb 2019 09:27:29 -0800\0" "To\0linux-fscrypt@vger.kernel.org\0" "Cc\0Satya Tangirala <satyat@google.com>" linux-api@vger.kernel.org @@ -248,7 +248,7 @@ "+\t\terr = add_existing_master_key(key->payload.data[0], secret,\n" "+\t\t\t\t\t mk_spec);\n" "+\t\tup_write(&key->sem);\n" - "+\t\tif (err = KEY_DEAD) {\n" + "+\t\tif (err == KEY_DEAD) {\n" "+\t\t\t/* Key being removed or needs to be removed */\n" "+\t\t\tkey_invalidate(key);\n" "+\t\t\tkey_put(key);\n" @@ -565,10 +565,11 @@ " \tif (res)\n" " \t\tgoto out;\n" " \n" - "-\tif (cmpxchg(&inode->i_crypt_info, NULL, crypt_info) = NULL)\n" - "+\tif (cmpxchg(&inode->i_crypt_info, NULL, crypt_info) = NULL) {\n" + "-\tif (cmpxchg(&inode->i_crypt_info, NULL, crypt_info) == NULL)\n" + "+\tif (cmpxchg(&inode->i_crypt_info, NULL, crypt_info) == NULL) {\n" "+\t\tif (master_key) {\n" - "+\t\t\tstruct fscrypt_master_key *mk +\t\t\t\tmaster_key->payload.data[0];\n" + "+\t\t\tstruct fscrypt_master_key *mk =\n" + "+\t\t\t\tmaster_key->payload.data[0];\n" "+\n" "+\t\t\trefcount_inc(&mk->mk_refcount);\n" "+\t\t\tcrypt_info->ci_master_key = key_get(master_key);\n" @@ -585,7 +586,7 @@ "+\t\tup_read(&master_key->sem);\n" "+\t\tkey_put(master_key);\n" "+\t}\n" - " \tif (res = -ENOKEY)\n" + " \tif (res == -ENOKEY)\n" " \t\tres = 0;\n" " \tput_crypt_info(crypt_info);\n" "diff --git a/include/linux/fscrypt.h b/include/linux/fscrypt.h\n" @@ -638,4 +639,4 @@ "-- \n" 2.20.1 -e82bf52aca303a9275784d74d12c44c3d2b366b073cd0daaa42c8a628ec48600 +0a224769243c049e70108fbc8360e3b15a190a9ff84ac194f30c67a07ddf3ef8
diff --git a/a/1.txt b/N2/1.txt index 83f4d12..420f5e1 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -232,7 +232,7 @@ index 252e863d681d..82d272c20969 100644 + err = add_existing_master_key(key->payload.data[0], secret, + mk_spec); + up_write(&key->sem); -+ if (err = KEY_DEAD) { ++ if (err == KEY_DEAD) { + /* Key being removed or needs to be removed */ + key_invalidate(key); + key_put(key); @@ -549,10 +549,11 @@ index b63fb4e8aebd..8ffcfee73702 100644 if (res) goto out; -- if (cmpxchg(&inode->i_crypt_info, NULL, crypt_info) = NULL) -+ if (cmpxchg(&inode->i_crypt_info, NULL, crypt_info) = NULL) { +- if (cmpxchg(&inode->i_crypt_info, NULL, crypt_info) == NULL) ++ if (cmpxchg(&inode->i_crypt_info, NULL, crypt_info) == NULL) { + if (master_key) { -+ struct fscrypt_master_key *mk + master_key->payload.data[0]; ++ struct fscrypt_master_key *mk = ++ master_key->payload.data[0]; + + refcount_inc(&mk->mk_refcount); + crypt_info->ci_master_key = key_get(master_key); @@ -569,7 +570,7 @@ index b63fb4e8aebd..8ffcfee73702 100644 + up_read(&master_key->sem); + key_put(master_key); + } - if (res = -ENOKEY) + if (res == -ENOKEY) res = 0; put_crypt_info(crypt_info); diff --git a/include/linux/fscrypt.h b/include/linux/fscrypt.h diff --git a/a/content_digest b/N2/content_digest index 0da338a..404709a 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,16 +1,16 @@ "ref\020190211172738.4633-1-ebiggers@kernel.org\0" "From\0Eric Biggers <ebiggers@kernel.org>\0" "Subject\0[RFC PATCH v2 11/20] fscrypt: add FS_IOC_REMOVE_ENCRYPTION_KEY ioctl\0" - "Date\0Mon, 11 Feb 2019 17:27:29 +0000\0" + "Date\0Mon, 11 Feb 2019 09:27:29 -0800\0" "To\0linux-fscrypt@vger.kernel.org\0" - "Cc\0Satya Tangirala <satyat@google.com>" - linux-api@vger.kernel.org + "Cc\0linux-ext4@vger.kernel.org" linux-f2fs-devel@lists.sourceforge.net - keyrings@vger.kernel.org linux-mtd@lists.infradead.org - linux-crypto@vger.kernel.org linux-fsdevel@vger.kernel.org - linux-ext4@vger.kernel.org + linux-crypto@vger.kernel.org + linux-api@vger.kernel.org + keyrings@vger.kernel.org + Satya Tangirala <satyat@google.com> " Paul Crowley <paulcrowley@google.com>\0" "\00:1\0" "b\0" @@ -248,7 +248,7 @@ "+\t\terr = add_existing_master_key(key->payload.data[0], secret,\n" "+\t\t\t\t\t mk_spec);\n" "+\t\tup_write(&key->sem);\n" - "+\t\tif (err = KEY_DEAD) {\n" + "+\t\tif (err == KEY_DEAD) {\n" "+\t\t\t/* Key being removed or needs to be removed */\n" "+\t\t\tkey_invalidate(key);\n" "+\t\t\tkey_put(key);\n" @@ -565,10 +565,11 @@ " \tif (res)\n" " \t\tgoto out;\n" " \n" - "-\tif (cmpxchg(&inode->i_crypt_info, NULL, crypt_info) = NULL)\n" - "+\tif (cmpxchg(&inode->i_crypt_info, NULL, crypt_info) = NULL) {\n" + "-\tif (cmpxchg(&inode->i_crypt_info, NULL, crypt_info) == NULL)\n" + "+\tif (cmpxchg(&inode->i_crypt_info, NULL, crypt_info) == NULL) {\n" "+\t\tif (master_key) {\n" - "+\t\t\tstruct fscrypt_master_key *mk +\t\t\t\tmaster_key->payload.data[0];\n" + "+\t\t\tstruct fscrypt_master_key *mk =\n" + "+\t\t\t\tmaster_key->payload.data[0];\n" "+\n" "+\t\t\trefcount_inc(&mk->mk_refcount);\n" "+\t\t\tcrypt_info->ci_master_key = key_get(master_key);\n" @@ -585,7 +586,7 @@ "+\t\tup_read(&master_key->sem);\n" "+\t\tkey_put(master_key);\n" "+\t}\n" - " \tif (res = -ENOKEY)\n" + " \tif (res == -ENOKEY)\n" " \t\tres = 0;\n" " \tput_crypt_info(crypt_info);\n" "diff --git a/include/linux/fscrypt.h b/include/linux/fscrypt.h\n" @@ -638,4 +639,4 @@ "-- \n" 2.20.1 -e82bf52aca303a9275784d74d12c44c3d2b366b073cd0daaa42c8a628ec48600 +9ad54661ae709a129dfb3c3978b0a936af22272a8bed413774cd2b0b1f047940
diff --git a/a/1.txt b/N3/1.txt index 83f4d12..4e30d0c 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -232,7 +232,7 @@ index 252e863d681d..82d272c20969 100644 + err = add_existing_master_key(key->payload.data[0], secret, + mk_spec); + up_write(&key->sem); -+ if (err = KEY_DEAD) { ++ if (err == KEY_DEAD) { + /* Key being removed or needs to be removed */ + key_invalidate(key); + key_put(key); @@ -549,10 +549,11 @@ index b63fb4e8aebd..8ffcfee73702 100644 if (res) goto out; -- if (cmpxchg(&inode->i_crypt_info, NULL, crypt_info) = NULL) -+ if (cmpxchg(&inode->i_crypt_info, NULL, crypt_info) = NULL) { +- if (cmpxchg(&inode->i_crypt_info, NULL, crypt_info) == NULL) ++ if (cmpxchg(&inode->i_crypt_info, NULL, crypt_info) == NULL) { + if (master_key) { -+ struct fscrypt_master_key *mk + master_key->payload.data[0]; ++ struct fscrypt_master_key *mk = ++ master_key->payload.data[0]; + + refcount_inc(&mk->mk_refcount); + crypt_info->ci_master_key = key_get(master_key); @@ -569,7 +570,7 @@ index b63fb4e8aebd..8ffcfee73702 100644 + up_read(&master_key->sem); + key_put(master_key); + } - if (res = -ENOKEY) + if (res == -ENOKEY) res = 0; put_crypt_info(crypt_info); diff --git a/include/linux/fscrypt.h b/include/linux/fscrypt.h @@ -621,3 +622,10 @@ index 7bed24632bda..3302a407131e 100644 -- 2.20.1 + + + +_______________________________________________ +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 0da338a..ef2cc9b 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -1,7 +1,7 @@ "ref\020190211172738.4633-1-ebiggers@kernel.org\0" "From\0Eric Biggers <ebiggers@kernel.org>\0" - "Subject\0[RFC PATCH v2 11/20] fscrypt: add FS_IOC_REMOVE_ENCRYPTION_KEY ioctl\0" - "Date\0Mon, 11 Feb 2019 17:27:29 +0000\0" + "Subject\0[f2fs-dev] [RFC PATCH v2 11/20] fscrypt: add FS_IOC_REMOVE_ENCRYPTION_KEY ioctl\0" + "Date\0Mon, 11 Feb 2019 09:27:29 -0800\0" "To\0linux-fscrypt@vger.kernel.org\0" "Cc\0Satya Tangirala <satyat@google.com>" linux-api@vger.kernel.org @@ -248,7 +248,7 @@ "+\t\terr = add_existing_master_key(key->payload.data[0], secret,\n" "+\t\t\t\t\t mk_spec);\n" "+\t\tup_write(&key->sem);\n" - "+\t\tif (err = KEY_DEAD) {\n" + "+\t\tif (err == KEY_DEAD) {\n" "+\t\t\t/* Key being removed or needs to be removed */\n" "+\t\t\tkey_invalidate(key);\n" "+\t\t\tkey_put(key);\n" @@ -565,10 +565,11 @@ " \tif (res)\n" " \t\tgoto out;\n" " \n" - "-\tif (cmpxchg(&inode->i_crypt_info, NULL, crypt_info) = NULL)\n" - "+\tif (cmpxchg(&inode->i_crypt_info, NULL, crypt_info) = NULL) {\n" + "-\tif (cmpxchg(&inode->i_crypt_info, NULL, crypt_info) == NULL)\n" + "+\tif (cmpxchg(&inode->i_crypt_info, NULL, crypt_info) == NULL) {\n" "+\t\tif (master_key) {\n" - "+\t\t\tstruct fscrypt_master_key *mk +\t\t\t\tmaster_key->payload.data[0];\n" + "+\t\t\tstruct fscrypt_master_key *mk =\n" + "+\t\t\t\tmaster_key->payload.data[0];\n" "+\n" "+\t\t\trefcount_inc(&mk->mk_refcount);\n" "+\t\t\tcrypt_info->ci_master_key = key_get(master_key);\n" @@ -585,7 +586,7 @@ "+\t\tup_read(&master_key->sem);\n" "+\t\tkey_put(master_key);\n" "+\t}\n" - " \tif (res = -ENOKEY)\n" + " \tif (res == -ENOKEY)\n" " \t\tres = 0;\n" " \tput_crypt_info(crypt_info);\n" "diff --git a/include/linux/fscrypt.h b/include/linux/fscrypt.h\n" @@ -636,6 +637,13 @@ " /**********************************************************************/\n" " \n" "-- \n" - 2.20.1 + "2.20.1\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 -e82bf52aca303a9275784d74d12c44c3d2b366b073cd0daaa42c8a628ec48600 +71eaa71cac437547c4764379aef4a10e9f3ace0896d335c508689780cf65e16e
diff --git a/a/1.txt b/N4/1.txt index 83f4d12..c05ccc8 100644 --- a/a/1.txt +++ b/N4/1.txt @@ -232,7 +232,7 @@ index 252e863d681d..82d272c20969 100644 + err = add_existing_master_key(key->payload.data[0], secret, + mk_spec); + up_write(&key->sem); -+ if (err = KEY_DEAD) { ++ if (err == KEY_DEAD) { + /* Key being removed or needs to be removed */ + key_invalidate(key); + key_put(key); @@ -549,10 +549,11 @@ index b63fb4e8aebd..8ffcfee73702 100644 if (res) goto out; -- if (cmpxchg(&inode->i_crypt_info, NULL, crypt_info) = NULL) -+ if (cmpxchg(&inode->i_crypt_info, NULL, crypt_info) = NULL) { +- if (cmpxchg(&inode->i_crypt_info, NULL, crypt_info) == NULL) ++ if (cmpxchg(&inode->i_crypt_info, NULL, crypt_info) == NULL) { + if (master_key) { -+ struct fscrypt_master_key *mk + master_key->payload.data[0]; ++ struct fscrypt_master_key *mk = ++ master_key->payload.data[0]; + + refcount_inc(&mk->mk_refcount); + crypt_info->ci_master_key = key_get(master_key); @@ -569,7 +570,7 @@ index b63fb4e8aebd..8ffcfee73702 100644 + up_read(&master_key->sem); + key_put(master_key); + } - if (res = -ENOKEY) + if (res == -ENOKEY) res = 0; put_crypt_info(crypt_info); diff --git a/include/linux/fscrypt.h b/include/linux/fscrypt.h @@ -621,3 +622,8 @@ index 7bed24632bda..3302a407131e 100644 -- 2.20.1 + + +______________________________________________________ +Linux MTD discussion mailing list +http://lists.infradead.org/mailman/listinfo/linux-mtd/ diff --git a/a/content_digest b/N4/content_digest index 0da338a..034c244 100644 --- a/a/content_digest +++ b/N4/content_digest @@ -1,7 +1,7 @@ "ref\020190211172738.4633-1-ebiggers@kernel.org\0" "From\0Eric Biggers <ebiggers@kernel.org>\0" "Subject\0[RFC PATCH v2 11/20] fscrypt: add FS_IOC_REMOVE_ENCRYPTION_KEY ioctl\0" - "Date\0Mon, 11 Feb 2019 17:27:29 +0000\0" + "Date\0Mon, 11 Feb 2019 09:27:29 -0800\0" "To\0linux-fscrypt@vger.kernel.org\0" "Cc\0Satya Tangirala <satyat@google.com>" linux-api@vger.kernel.org @@ -248,7 +248,7 @@ "+\t\terr = add_existing_master_key(key->payload.data[0], secret,\n" "+\t\t\t\t\t mk_spec);\n" "+\t\tup_write(&key->sem);\n" - "+\t\tif (err = KEY_DEAD) {\n" + "+\t\tif (err == KEY_DEAD) {\n" "+\t\t\t/* Key being removed or needs to be removed */\n" "+\t\t\tkey_invalidate(key);\n" "+\t\t\tkey_put(key);\n" @@ -565,10 +565,11 @@ " \tif (res)\n" " \t\tgoto out;\n" " \n" - "-\tif (cmpxchg(&inode->i_crypt_info, NULL, crypt_info) = NULL)\n" - "+\tif (cmpxchg(&inode->i_crypt_info, NULL, crypt_info) = NULL) {\n" + "-\tif (cmpxchg(&inode->i_crypt_info, NULL, crypt_info) == NULL)\n" + "+\tif (cmpxchg(&inode->i_crypt_info, NULL, crypt_info) == NULL) {\n" "+\t\tif (master_key) {\n" - "+\t\t\tstruct fscrypt_master_key *mk +\t\t\t\tmaster_key->payload.data[0];\n" + "+\t\t\tstruct fscrypt_master_key *mk =\n" + "+\t\t\t\tmaster_key->payload.data[0];\n" "+\n" "+\t\t\trefcount_inc(&mk->mk_refcount);\n" "+\t\t\tcrypt_info->ci_master_key = key_get(master_key);\n" @@ -585,7 +586,7 @@ "+\t\tup_read(&master_key->sem);\n" "+\t\tkey_put(master_key);\n" "+\t}\n" - " \tif (res = -ENOKEY)\n" + " \tif (res == -ENOKEY)\n" " \t\tres = 0;\n" " \tput_crypt_info(crypt_info);\n" "diff --git a/include/linux/fscrypt.h b/include/linux/fscrypt.h\n" @@ -636,6 +637,11 @@ " /**********************************************************************/\n" " \n" "-- \n" - 2.20.1 + "2.20.1\n" + "\n" + "\n" + "______________________________________________________\n" + "Linux MTD discussion mailing list\n" + http://lists.infradead.org/mailman/listinfo/linux-mtd/ -e82bf52aca303a9275784d74d12c44c3d2b366b073cd0daaa42c8a628ec48600 +22a49a5289a6591189268178ee1259cfdda03638b546690088ac10eb72fb2055
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.