diff for duplicates of <20150124193124.GA18322@mwanda> diff --git a/a/1.txt b/N1/1.txt index 4168bec..0827068 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -33,10 +33,10 @@ index 0855f77..66d2c13 100644 p = get_acl(dir, ACL_TYPE_DEFAULT); - if (IS_ERR(p)) { -- if (p = ERR_PTR(-EOPNOTSUPP)) +- if (p == ERR_PTR(-EOPNOTSUPP)) - goto apply_umask; - return PTR_ERR(p); -+ if (!p || p = ERR_PTR(-EOPNOTSUPP)) { ++ if (!p || p == ERR_PTR(-EOPNOTSUPP)) { + *mode &= ~current_umask(); + return 0; } @@ -60,11 +60,11 @@ index 0855f77..66d2c13 100644 return -ENOMEM; } -- if (ret = 0) { +- if (ret == 0) { - posix_acl_release(*acl); - *acl = NULL; - } -+ if (ret = 0) ++ if (ret == 0) + posix_acl_release(clone); + else + *acl = clone; diff --git a/a/content_digest b/N1/content_digest index 9633ade..ecf1406 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Dan Carpenter <dan.carpenter@oracle.com>\0" "Subject\0[patch] posix_acl: cleanup posix_acl_create()\0" - "Date\0Sat, 24 Jan 2015 19:31:24 +0000\0" + "Date\0Sat, 24 Jan 2015 22:31:24 +0300\0" "To\0Alexander Viro <viro@zeniv.linux.org.uk>\0" "Cc\0linux-fsdevel@vger.kernel.org" " kernel-janitors@vger.kernel.org\0" @@ -41,10 +41,10 @@ " \n" " \tp = get_acl(dir, ACL_TYPE_DEFAULT);\n" "-\tif (IS_ERR(p)) {\n" - "-\t\tif (p = ERR_PTR(-EOPNOTSUPP))\n" + "-\t\tif (p == ERR_PTR(-EOPNOTSUPP))\n" "-\t\t\tgoto apply_umask;\n" "-\t\treturn PTR_ERR(p);\n" - "+\tif (!p || p = ERR_PTR(-EOPNOTSUPP)) {\n" + "+\tif (!p || p == ERR_PTR(-EOPNOTSUPP)) {\n" "+\t\t*mode &= ~current_umask();\n" "+\t\treturn 0;\n" " \t}\n" @@ -68,11 +68,11 @@ " \t\treturn -ENOMEM;\n" " \t}\n" " \n" - "-\tif (ret = 0) {\n" + "-\tif (ret == 0) {\n" "-\t\tposix_acl_release(*acl);\n" "-\t\t*acl = NULL;\n" "-\t}\n" - "+\tif (ret = 0)\n" + "+\tif (ret == 0)\n" "+\t\tposix_acl_release(clone);\n" "+\telse\n" "+\t\t*acl = clone;\n" @@ -96,4 +96,4 @@ " }\n" EXPORT_SYMBOL_GPL(posix_acl_create); -ac7231e222e2418775df521222a28eea1469ca3ab098fb6f9bc48c74bfd99886 +b3304151c4e591e74faea97dd1cd16a61b6de75f0070f6b706f2d5d707cc77ce
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.