diff for duplicates of <20190520172552.217253-8-ebiggers@kernel.org> diff --git a/a/1.txt b/N1/1.txt index e5a0f69..1e717e0 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -239,7 +239,7 @@ index 481916013c713..701da63f01073 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); @@ -313,14 +313,15 @@ index 481916013c713..701da63f01073 100644 + list_for_each(pos, &mk->mk_decrypted_inodes) + busy_count++; + -+ if (busy_count = 0) { ++ if (busy_count == 0) { + spin_unlock(&mk->mk_decrypted_inodes_lock); + return 0; + } + + { + /* select an example file to show for debugging purposes */ -+ struct inode *inode + list_first_entry(&mk->mk_decrypted_inodes, ++ struct inode *inode = ++ list_first_entry(&mk->mk_decrypted_inodes, + struct fscrypt_info, + ci_master_key_link)->ci_inode; + ino = inode->i_ino; @@ -562,10 +563,11 @@ index 13425513fa5c1..55cb146a8a617 100644 if (res) goto out; -- if (cmpxchg_release(&inode->i_crypt_info, NULL, crypt_info) = NULL) -+ if (cmpxchg_release(&inode->i_crypt_info, NULL, crypt_info) = NULL) { +- if (cmpxchg_release(&inode->i_crypt_info, NULL, crypt_info) == NULL) ++ if (cmpxchg_release(&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); @@ -582,7 +584,7 @@ index 13425513fa5c1..55cb146a8a617 100644 + up_read(&master_key->sem); + key_put(master_key); + } - if (res = -ENOKEY) + if (res == -ENOKEY) res = 0; put_crypt_info(crypt_info); @@ -359,3 +420,39 @@ void fscrypt_free_inode(struct inode *inode) diff --git a/a/content_digest b/N1/content_digest index 7512b8d..b25941b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020190520172552.217253-1-ebiggers@kernel.org\0" "From\0Eric Biggers <ebiggers@kernel.org>\0" "Subject\0[PATCH v6 07/16] fscrypt: add FS_IOC_REMOVE_ENCRYPTION_KEY ioctl\0" - "Date\0Mon, 20 May 2019 17:25:43 +0000\0" + "Date\0Mon, 20 May 2019 10:25:43 -0700\0" "To\0linux-fscrypt@vger.kernel.org\0" "Cc\0linux-ext4@vger.kernel.org" linux-api@vger.kernel.org @@ -255,7 +255,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" @@ -329,14 +329,15 @@ "+\tlist_for_each(pos, &mk->mk_decrypted_inodes)\n" "+\t\tbusy_count++;\n" "+\n" - "+\tif (busy_count = 0) {\n" + "+\tif (busy_count == 0) {\n" "+\t\tspin_unlock(&mk->mk_decrypted_inodes_lock);\n" "+\t\treturn 0;\n" "+\t}\n" "+\n" "+\t{\n" "+\t\t/* select an example file to show for debugging purposes */\n" - "+\t\tstruct inode *inode +\t\t\tlist_first_entry(&mk->mk_decrypted_inodes,\n" + "+\t\tstruct inode *inode =\n" + "+\t\t\tlist_first_entry(&mk->mk_decrypted_inodes,\n" "+\t\t\t\t\t struct fscrypt_info,\n" "+\t\t\t\t\t ci_master_key_link)->ci_inode;\n" "+\t\tino = inode->i_ino;\n" @@ -578,10 +579,11 @@ " \tif (res)\n" " \t\tgoto out;\n" " \n" - "-\tif (cmpxchg_release(&inode->i_crypt_info, NULL, crypt_info) = NULL)\n" - "+\tif (cmpxchg_release(&inode->i_crypt_info, NULL, crypt_info) = NULL) {\n" + "-\tif (cmpxchg_release(&inode->i_crypt_info, NULL, crypt_info) == NULL)\n" + "+\tif (cmpxchg_release(&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" @@ -598,7 +600,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" "@@ -359,3 +420,39 @@ void fscrypt_free_inode(struct inode *inode)\n" @@ -709,4 +711,4 @@ "-- \n" 2.21.0.1020.gf2820cf01a-goog -e85fd7883b4156e39674c0aed20973d9fecaab1ffe499b9e84a45e58397ae99b +110a639cdac798330d2c3be3af4b153c0d09fbda0b2939b418bd64dfc0b055be
diff --git a/a/1.txt b/N2/1.txt index e5a0f69..1e717e0 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -239,7 +239,7 @@ index 481916013c713..701da63f01073 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); @@ -313,14 +313,15 @@ index 481916013c713..701da63f01073 100644 + list_for_each(pos, &mk->mk_decrypted_inodes) + busy_count++; + -+ if (busy_count = 0) { ++ if (busy_count == 0) { + spin_unlock(&mk->mk_decrypted_inodes_lock); + return 0; + } + + { + /* select an example file to show for debugging purposes */ -+ struct inode *inode + list_first_entry(&mk->mk_decrypted_inodes, ++ struct inode *inode = ++ list_first_entry(&mk->mk_decrypted_inodes, + struct fscrypt_info, + ci_master_key_link)->ci_inode; + ino = inode->i_ino; @@ -562,10 +563,11 @@ index 13425513fa5c1..55cb146a8a617 100644 if (res) goto out; -- if (cmpxchg_release(&inode->i_crypt_info, NULL, crypt_info) = NULL) -+ if (cmpxchg_release(&inode->i_crypt_info, NULL, crypt_info) = NULL) { +- if (cmpxchg_release(&inode->i_crypt_info, NULL, crypt_info) == NULL) ++ if (cmpxchg_release(&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); @@ -582,7 +584,7 @@ index 13425513fa5c1..55cb146a8a617 100644 + up_read(&master_key->sem); + key_put(master_key); + } - if (res = -ENOKEY) + if (res == -ENOKEY) res = 0; put_crypt_info(crypt_info); @@ -359,3 +420,39 @@ void fscrypt_free_inode(struct inode *inode) diff --git a/a/content_digest b/N2/content_digest index 7512b8d..84ac513 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,16 +1,16 @@ "ref\020190520172552.217253-1-ebiggers@kernel.org\0" "From\0Eric Biggers <ebiggers@kernel.org>\0" "Subject\0[PATCH v6 07/16] fscrypt: add FS_IOC_REMOVE_ENCRYPTION_KEY ioctl\0" - "Date\0Mon, 20 May 2019 17:25:43 +0000\0" + "Date\0Mon, 20 May 2019 10:25:43 -0700\0" "To\0linux-fscrypt@vger.kernel.org\0" - "Cc\0linux-ext4@vger.kernel.org" + "Cc\0Satya Tangirala <satyat@google.com>" linux-api@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 - Satya Tangirala <satyat@google.com> + linux-ext4@vger.kernel.org " Paul Crowley <paulcrowley@google.com>\0" "\00:1\0" "b\0" @@ -255,7 +255,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" @@ -329,14 +329,15 @@ "+\tlist_for_each(pos, &mk->mk_decrypted_inodes)\n" "+\t\tbusy_count++;\n" "+\n" - "+\tif (busy_count = 0) {\n" + "+\tif (busy_count == 0) {\n" "+\t\tspin_unlock(&mk->mk_decrypted_inodes_lock);\n" "+\t\treturn 0;\n" "+\t}\n" "+\n" "+\t{\n" "+\t\t/* select an example file to show for debugging purposes */\n" - "+\t\tstruct inode *inode +\t\t\tlist_first_entry(&mk->mk_decrypted_inodes,\n" + "+\t\tstruct inode *inode =\n" + "+\t\t\tlist_first_entry(&mk->mk_decrypted_inodes,\n" "+\t\t\t\t\t struct fscrypt_info,\n" "+\t\t\t\t\t ci_master_key_link)->ci_inode;\n" "+\t\tino = inode->i_ino;\n" @@ -578,10 +579,11 @@ " \tif (res)\n" " \t\tgoto out;\n" " \n" - "-\tif (cmpxchg_release(&inode->i_crypt_info, NULL, crypt_info) = NULL)\n" - "+\tif (cmpxchg_release(&inode->i_crypt_info, NULL, crypt_info) = NULL) {\n" + "-\tif (cmpxchg_release(&inode->i_crypt_info, NULL, crypt_info) == NULL)\n" + "+\tif (cmpxchg_release(&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" @@ -598,7 +600,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" "@@ -359,3 +420,39 @@ void fscrypt_free_inode(struct inode *inode)\n" @@ -709,4 +711,4 @@ "-- \n" 2.21.0.1020.gf2820cf01a-goog -e85fd7883b4156e39674c0aed20973d9fecaab1ffe499b9e84a45e58397ae99b +293db427eb61cd37e65548b16149da3b58a343f859cac736523042728ab4be1a
diff --git a/a/1.txt b/N3/1.txt index e5a0f69..a7d6af7 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -239,7 +239,7 @@ index 481916013c713..701da63f01073 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); @@ -313,14 +313,15 @@ index 481916013c713..701da63f01073 100644 + list_for_each(pos, &mk->mk_decrypted_inodes) + busy_count++; + -+ if (busy_count = 0) { ++ if (busy_count == 0) { + spin_unlock(&mk->mk_decrypted_inodes_lock); + return 0; + } + + { + /* select an example file to show for debugging purposes */ -+ struct inode *inode + list_first_entry(&mk->mk_decrypted_inodes, ++ struct inode *inode = ++ list_first_entry(&mk->mk_decrypted_inodes, + struct fscrypt_info, + ci_master_key_link)->ci_inode; + ino = inode->i_ino; @@ -562,10 +563,11 @@ index 13425513fa5c1..55cb146a8a617 100644 if (res) goto out; -- if (cmpxchg_release(&inode->i_crypt_info, NULL, crypt_info) = NULL) -+ if (cmpxchg_release(&inode->i_crypt_info, NULL, crypt_info) = NULL) { +- if (cmpxchg_release(&inode->i_crypt_info, NULL, crypt_info) == NULL) ++ if (cmpxchg_release(&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); @@ -582,7 +584,7 @@ index 13425513fa5c1..55cb146a8a617 100644 + up_read(&master_key->sem); + key_put(master_key); + } - if (res = -ENOKEY) + if (res == -ENOKEY) res = 0; put_crypt_info(crypt_info); @@ -359,3 +420,39 @@ void fscrypt_free_inode(struct inode *inode) @@ -692,3 +694,10 @@ index 7bed24632bda7..3302a407131e6 100644 -- 2.21.0.1020.gf2820cf01a-goog + + + +_______________________________________________ +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 7512b8d..566d4bb 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -1,7 +1,7 @@ "ref\020190520172552.217253-1-ebiggers@kernel.org\0" "From\0Eric Biggers <ebiggers@kernel.org>\0" - "Subject\0[PATCH v6 07/16] fscrypt: add FS_IOC_REMOVE_ENCRYPTION_KEY ioctl\0" - "Date\0Mon, 20 May 2019 17:25:43 +0000\0" + "Subject\0[f2fs-dev] [PATCH v6 07/16] fscrypt: add FS_IOC_REMOVE_ENCRYPTION_KEY ioctl\0" + "Date\0Mon, 20 May 2019 10:25:43 -0700\0" "To\0linux-fscrypt@vger.kernel.org\0" "Cc\0linux-ext4@vger.kernel.org" linux-api@vger.kernel.org @@ -255,7 +255,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" @@ -329,14 +329,15 @@ "+\tlist_for_each(pos, &mk->mk_decrypted_inodes)\n" "+\t\tbusy_count++;\n" "+\n" - "+\tif (busy_count = 0) {\n" + "+\tif (busy_count == 0) {\n" "+\t\tspin_unlock(&mk->mk_decrypted_inodes_lock);\n" "+\t\treturn 0;\n" "+\t}\n" "+\n" "+\t{\n" "+\t\t/* select an example file to show for debugging purposes */\n" - "+\t\tstruct inode *inode +\t\t\tlist_first_entry(&mk->mk_decrypted_inodes,\n" + "+\t\tstruct inode *inode =\n" + "+\t\t\tlist_first_entry(&mk->mk_decrypted_inodes,\n" "+\t\t\t\t\t struct fscrypt_info,\n" "+\t\t\t\t\t ci_master_key_link)->ci_inode;\n" "+\t\tino = inode->i_ino;\n" @@ -578,10 +579,11 @@ " \tif (res)\n" " \t\tgoto out;\n" " \n" - "-\tif (cmpxchg_release(&inode->i_crypt_info, NULL, crypt_info) = NULL)\n" - "+\tif (cmpxchg_release(&inode->i_crypt_info, NULL, crypt_info) = NULL) {\n" + "-\tif (cmpxchg_release(&inode->i_crypt_info, NULL, crypt_info) == NULL)\n" + "+\tif (cmpxchg_release(&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" @@ -598,7 +600,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" "@@ -359,3 +420,39 @@ void fscrypt_free_inode(struct inode *inode)\n" @@ -707,6 +709,13 @@ " /**********************************************************************/\n" " \n" "-- \n" - 2.21.0.1020.gf2820cf01a-goog + "2.21.0.1020.gf2820cf01a-goog\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 -e85fd7883b4156e39674c0aed20973d9fecaab1ffe499b9e84a45e58397ae99b +4577e5d2f0459c4bff9c5abd6b773f1ebea9253f19dd807399d25a063e16d66e
diff --git a/a/1.txt b/N4/1.txt index e5a0f69..77de0ac 100644 --- a/a/1.txt +++ b/N4/1.txt @@ -239,7 +239,7 @@ index 481916013c713..701da63f01073 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); @@ -313,14 +313,15 @@ index 481916013c713..701da63f01073 100644 + list_for_each(pos, &mk->mk_decrypted_inodes) + busy_count++; + -+ if (busy_count = 0) { ++ if (busy_count == 0) { + spin_unlock(&mk->mk_decrypted_inodes_lock); + return 0; + } + + { + /* select an example file to show for debugging purposes */ -+ struct inode *inode + list_first_entry(&mk->mk_decrypted_inodes, ++ struct inode *inode = ++ list_first_entry(&mk->mk_decrypted_inodes, + struct fscrypt_info, + ci_master_key_link)->ci_inode; + ino = inode->i_ino; @@ -562,10 +563,11 @@ index 13425513fa5c1..55cb146a8a617 100644 if (res) goto out; -- if (cmpxchg_release(&inode->i_crypt_info, NULL, crypt_info) = NULL) -+ if (cmpxchg_release(&inode->i_crypt_info, NULL, crypt_info) = NULL) { +- if (cmpxchg_release(&inode->i_crypt_info, NULL, crypt_info) == NULL) ++ if (cmpxchg_release(&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); @@ -582,7 +584,7 @@ index 13425513fa5c1..55cb146a8a617 100644 + up_read(&master_key->sem); + key_put(master_key); + } - if (res = -ENOKEY) + if (res == -ENOKEY) res = 0; put_crypt_info(crypt_info); @@ -359,3 +420,39 @@ void fscrypt_free_inode(struct inode *inode) @@ -692,3 +694,8 @@ index 7bed24632bda7..3302a407131e6 100644 -- 2.21.0.1020.gf2820cf01a-goog + + +______________________________________________________ +Linux MTD discussion mailing list +http://lists.infradead.org/mailman/listinfo/linux-mtd/ diff --git a/a/content_digest b/N4/content_digest index 7512b8d..10df729 100644 --- a/a/content_digest +++ b/N4/content_digest @@ -1,7 +1,7 @@ "ref\020190520172552.217253-1-ebiggers@kernel.org\0" "From\0Eric Biggers <ebiggers@kernel.org>\0" "Subject\0[PATCH v6 07/16] fscrypt: add FS_IOC_REMOVE_ENCRYPTION_KEY ioctl\0" - "Date\0Mon, 20 May 2019 17:25:43 +0000\0" + "Date\0Mon, 20 May 2019 10:25:43 -0700\0" "To\0linux-fscrypt@vger.kernel.org\0" "Cc\0linux-ext4@vger.kernel.org" linux-api@vger.kernel.org @@ -255,7 +255,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" @@ -329,14 +329,15 @@ "+\tlist_for_each(pos, &mk->mk_decrypted_inodes)\n" "+\t\tbusy_count++;\n" "+\n" - "+\tif (busy_count = 0) {\n" + "+\tif (busy_count == 0) {\n" "+\t\tspin_unlock(&mk->mk_decrypted_inodes_lock);\n" "+\t\treturn 0;\n" "+\t}\n" "+\n" "+\t{\n" "+\t\t/* select an example file to show for debugging purposes */\n" - "+\t\tstruct inode *inode +\t\t\tlist_first_entry(&mk->mk_decrypted_inodes,\n" + "+\t\tstruct inode *inode =\n" + "+\t\t\tlist_first_entry(&mk->mk_decrypted_inodes,\n" "+\t\t\t\t\t struct fscrypt_info,\n" "+\t\t\t\t\t ci_master_key_link)->ci_inode;\n" "+\t\tino = inode->i_ino;\n" @@ -578,10 +579,11 @@ " \tif (res)\n" " \t\tgoto out;\n" " \n" - "-\tif (cmpxchg_release(&inode->i_crypt_info, NULL, crypt_info) = NULL)\n" - "+\tif (cmpxchg_release(&inode->i_crypt_info, NULL, crypt_info) = NULL) {\n" + "-\tif (cmpxchg_release(&inode->i_crypt_info, NULL, crypt_info) == NULL)\n" + "+\tif (cmpxchg_release(&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" @@ -598,7 +600,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" "@@ -359,3 +420,39 @@ void fscrypt_free_inode(struct inode *inode)\n" @@ -707,6 +709,11 @@ " /**********************************************************************/\n" " \n" "-- \n" - 2.21.0.1020.gf2820cf01a-goog + "2.21.0.1020.gf2820cf01a-goog\n" + "\n" + "\n" + "______________________________________________________\n" + "Linux MTD discussion mailing list\n" + http://lists.infradead.org/mailman/listinfo/linux-mtd/ -e85fd7883b4156e39674c0aed20973d9fecaab1ffe499b9e84a45e58397ae99b +1350253a5cad31ef18c147cd259746465ef42c0e9dcddccf09c2a17539f32143
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.