All of lore.kernel.org
 help / color / mirror / Atom feed
diff for duplicates of <20190220065249.32099-10-ebiggers@kernel.org>

diff --git a/a/1.txt b/N1/1.txt
index c771735..2a5e08a 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -239,7 +239,7 @@ index d44d595b2fd0..da1bfe5934eb 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);
@@ -322,7 +322,8 @@ index d44d595b2fd0..da1bfe5934eb 100644
 +	err2 = 0;
 +	spin_lock(&mk->mk_decrypted_inodes_lock);
 +	if (!list_empty(&mk->mk_decrypted_inodes)) {
-+		const struct fscrypt_info *first_ci +			list_first_entry(&mk->mk_decrypted_inodes,
++		const struct fscrypt_info *first_ci =
++			list_first_entry(&mk->mk_decrypted_inodes,
 +					 struct fscrypt_info,
 +					 ci_master_key_link);
 +		fscrypt_warn(sb,
@@ -516,10 +517,11 @@ index b63fb4e8aebd..fb600cac8ee4 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);
@@ -536,7 +538,7 @@ index b63fb4e8aebd..fb600cac8ee4 100644
 +		up_read(&master_key->sem);
 +		key_put(master_key);
 +	}
- 	if (res = -ENOKEY)
+ 	if (res == -ENOKEY)
  		res = 0;
  	put_crypt_info(crypt_info);
 @@ -339,3 +400,39 @@ void fscrypt_put_encryption_info(struct inode *inode)
diff --git a/a/content_digest b/N1/content_digest
index 7ef377d..362f975 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,7 +1,7 @@
  "ref\020190220065249.32099-1-ebiggers@kernel.org\0"
  "From\0Eric Biggers <ebiggers@kernel.org>\0"
  "Subject\0[RFC PATCH v3 09/18] fscrypt: add FS_IOC_REMOVE_ENCRYPTION_KEY ioctl\0"
- "Date\0Wed, 20 Feb 2019 06:52:40 +0000\0"
+ "Date\0Tue, 19 Feb 2019 22:52:40 -0800\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"
@@ -338,7 +338,8 @@
  "+\terr2 = 0;\n"
  "+\tspin_lock(&mk->mk_decrypted_inodes_lock);\n"
  "+\tif (!list_empty(&mk->mk_decrypted_inodes)) {\n"
- "+\t\tconst struct fscrypt_info *first_ci +\t\t\tlist_first_entry(&mk->mk_decrypted_inodes,\n"
+ "+\t\tconst struct fscrypt_info *first_ci =\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);\n"
  "+\t\tfscrypt_warn(sb,\n"
@@ -532,10 +533,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"
@@ -552,7 +554,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"
  "@@ -339,3 +400,39 @@ void fscrypt_put_encryption_info(struct inode *inode)\n"
@@ -662,4 +664,4 @@
  "-- \n"
  2.20.1
 
-56eb23e1ddddf96202d36cce206ca49f412243a009e6b45ba2eb2830d59d1356
+bc793577f7f95f86e5ea768e1a054dfc92aacffd6cd93dcb7922a6c06a6114c5

diff --git a/a/1.txt b/N2/1.txt
index c771735..2a5e08a 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -239,7 +239,7 @@ index d44d595b2fd0..da1bfe5934eb 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);
@@ -322,7 +322,8 @@ index d44d595b2fd0..da1bfe5934eb 100644
 +	err2 = 0;
 +	spin_lock(&mk->mk_decrypted_inodes_lock);
 +	if (!list_empty(&mk->mk_decrypted_inodes)) {
-+		const struct fscrypt_info *first_ci +			list_first_entry(&mk->mk_decrypted_inodes,
++		const struct fscrypt_info *first_ci =
++			list_first_entry(&mk->mk_decrypted_inodes,
 +					 struct fscrypt_info,
 +					 ci_master_key_link);
 +		fscrypt_warn(sb,
@@ -516,10 +517,11 @@ index b63fb4e8aebd..fb600cac8ee4 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);
@@ -536,7 +538,7 @@ index b63fb4e8aebd..fb600cac8ee4 100644
 +		up_read(&master_key->sem);
 +		key_put(master_key);
 +	}
- 	if (res = -ENOKEY)
+ 	if (res == -ENOKEY)
  		res = 0;
  	put_crypt_info(crypt_info);
 @@ -339,3 +400,39 @@ void fscrypt_put_encryption_info(struct inode *inode)
diff --git a/a/content_digest b/N2/content_digest
index 7ef377d..8d8ba1e 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -1,16 +1,16 @@
  "ref\020190220065249.32099-1-ebiggers@kernel.org\0"
  "From\0Eric Biggers <ebiggers@kernel.org>\0"
  "Subject\0[RFC PATCH v3 09/18] fscrypt: add FS_IOC_REMOVE_ENCRYPTION_KEY ioctl\0"
- "Date\0Wed, 20 Feb 2019 06:52:40 +0000\0"
+ "Date\0Tue, 19 Feb 2019 22:52:40 -0800\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"
@@ -338,7 +338,8 @@
  "+\terr2 = 0;\n"
  "+\tspin_lock(&mk->mk_decrypted_inodes_lock);\n"
  "+\tif (!list_empty(&mk->mk_decrypted_inodes)) {\n"
- "+\t\tconst struct fscrypt_info *first_ci +\t\t\tlist_first_entry(&mk->mk_decrypted_inodes,\n"
+ "+\t\tconst struct fscrypt_info *first_ci =\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);\n"
  "+\t\tfscrypt_warn(sb,\n"
@@ -532,10 +533,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"
@@ -552,7 +554,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"
  "@@ -339,3 +400,39 @@ void fscrypt_put_encryption_info(struct inode *inode)\n"
@@ -662,4 +664,4 @@
  "-- \n"
  2.20.1
 
-56eb23e1ddddf96202d36cce206ca49f412243a009e6b45ba2eb2830d59d1356
+0cbc763d71ee7a8e3fc09c443bfd74f46058d91ddeb53b43bcdb30f2362b7d5c

diff --git a/a/1.txt b/N3/1.txt
index c771735..a89f8c1 100644
--- a/a/1.txt
+++ b/N3/1.txt
@@ -239,7 +239,7 @@ index d44d595b2fd0..da1bfe5934eb 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);
@@ -322,7 +322,8 @@ index d44d595b2fd0..da1bfe5934eb 100644
 +	err2 = 0;
 +	spin_lock(&mk->mk_decrypted_inodes_lock);
 +	if (!list_empty(&mk->mk_decrypted_inodes)) {
-+		const struct fscrypt_info *first_ci +			list_first_entry(&mk->mk_decrypted_inodes,
++		const struct fscrypt_info *first_ci =
++			list_first_entry(&mk->mk_decrypted_inodes,
 +					 struct fscrypt_info,
 +					 ci_master_key_link);
 +		fscrypt_warn(sb,
@@ -516,10 +517,11 @@ index b63fb4e8aebd..fb600cac8ee4 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);
@@ -536,7 +538,7 @@ index b63fb4e8aebd..fb600cac8ee4 100644
 +		up_read(&master_key->sem);
 +		key_put(master_key);
 +	}
- 	if (res = -ENOKEY)
+ 	if (res == -ENOKEY)
  		res = 0;
  	put_crypt_info(crypt_info);
 @@ -339,3 +400,39 @@ void fscrypt_put_encryption_info(struct inode *inode)
@@ -645,3 +647,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 7ef377d..cf5ab97 100644
--- a/a/content_digest
+++ b/N3/content_digest
@@ -1,7 +1,7 @@
  "ref\020190220065249.32099-1-ebiggers@kernel.org\0"
  "From\0Eric Biggers <ebiggers@kernel.org>\0"
- "Subject\0[RFC PATCH v3 09/18] fscrypt: add FS_IOC_REMOVE_ENCRYPTION_KEY ioctl\0"
- "Date\0Wed, 20 Feb 2019 06:52:40 +0000\0"
+ "Subject\0[f2fs-dev] [RFC PATCH v3 09/18] fscrypt: add FS_IOC_REMOVE_ENCRYPTION_KEY ioctl\0"
+ "Date\0Tue, 19 Feb 2019 22:52:40 -0800\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"
@@ -338,7 +338,8 @@
  "+\terr2 = 0;\n"
  "+\tspin_lock(&mk->mk_decrypted_inodes_lock);\n"
  "+\tif (!list_empty(&mk->mk_decrypted_inodes)) {\n"
- "+\t\tconst struct fscrypt_info *first_ci +\t\t\tlist_first_entry(&mk->mk_decrypted_inodes,\n"
+ "+\t\tconst struct fscrypt_info *first_ci =\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);\n"
  "+\t\tfscrypt_warn(sb,\n"
@@ -532,10 +533,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"
@@ -552,7 +554,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"
  "@@ -339,3 +400,39 @@ void fscrypt_put_encryption_info(struct inode *inode)\n"
@@ -660,6 +662,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
 
-56eb23e1ddddf96202d36cce206ca49f412243a009e6b45ba2eb2830d59d1356
+780793816297a4b969d2f55ae0796d8fe6360abdd1c501c9436aecb9ac35ca70

diff --git a/a/1.txt b/N4/1.txt
index c771735..d76b08e 100644
--- a/a/1.txt
+++ b/N4/1.txt
@@ -239,7 +239,7 @@ index d44d595b2fd0..da1bfe5934eb 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);
@@ -322,7 +322,8 @@ index d44d595b2fd0..da1bfe5934eb 100644
 +	err2 = 0;
 +	spin_lock(&mk->mk_decrypted_inodes_lock);
 +	if (!list_empty(&mk->mk_decrypted_inodes)) {
-+		const struct fscrypt_info *first_ci +			list_first_entry(&mk->mk_decrypted_inodes,
++		const struct fscrypt_info *first_ci =
++			list_first_entry(&mk->mk_decrypted_inodes,
 +					 struct fscrypt_info,
 +					 ci_master_key_link);
 +		fscrypt_warn(sb,
@@ -516,10 +517,11 @@ index b63fb4e8aebd..fb600cac8ee4 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);
@@ -536,7 +538,7 @@ index b63fb4e8aebd..fb600cac8ee4 100644
 +		up_read(&master_key->sem);
 +		key_put(master_key);
 +	}
- 	if (res = -ENOKEY)
+ 	if (res == -ENOKEY)
  		res = 0;
  	put_crypt_info(crypt_info);
 @@ -339,3 +400,39 @@ void fscrypt_put_encryption_info(struct inode *inode)
@@ -645,3 +647,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 7ef377d..8aed280 100644
--- a/a/content_digest
+++ b/N4/content_digest
@@ -1,7 +1,7 @@
  "ref\020190220065249.32099-1-ebiggers@kernel.org\0"
  "From\0Eric Biggers <ebiggers@kernel.org>\0"
  "Subject\0[RFC PATCH v3 09/18] fscrypt: add FS_IOC_REMOVE_ENCRYPTION_KEY ioctl\0"
- "Date\0Wed, 20 Feb 2019 06:52:40 +0000\0"
+ "Date\0Tue, 19 Feb 2019 22:52:40 -0800\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"
@@ -338,7 +338,8 @@
  "+\terr2 = 0;\n"
  "+\tspin_lock(&mk->mk_decrypted_inodes_lock);\n"
  "+\tif (!list_empty(&mk->mk_decrypted_inodes)) {\n"
- "+\t\tconst struct fscrypt_info *first_ci +\t\t\tlist_first_entry(&mk->mk_decrypted_inodes,\n"
+ "+\t\tconst struct fscrypt_info *first_ci =\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);\n"
  "+\t\tfscrypt_warn(sb,\n"
@@ -532,10 +533,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"
@@ -552,7 +554,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"
  "@@ -339,3 +400,39 @@ void fscrypt_put_encryption_info(struct inode *inode)\n"
@@ -660,6 +662,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/
 
-56eb23e1ddddf96202d36cce206ca49f412243a009e6b45ba2eb2830d59d1356
+7e505d6952586fc44d1ef64a8ad9157f3c2a78f478acef45ff8e7370751f0659

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.