diff for duplicates of <20150127045209.GA1608@mew> diff --git a/a/1.txt b/N1/1.txt index 59da8db..83aae5e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -43,10 +43,10 @@ success. > > 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; > } @@ -70,11 +70,11 @@ success. > 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 4b200d8..66625b6 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020150124193124.GA18322@mwanda\0" "From\0Omar Sandoval <osandov@osandov.com>\0" "Subject\0Re: [patch] posix_acl: cleanup posix_acl_create()\0" - "Date\0Tue, 27 Jan 2015 04:52:09 +0000\0" + "Date\0Mon, 26 Jan 2015 20:52:09 -0800\0" "To\0Dan Carpenter <dan.carpenter@oracle.com>\0" "Cc\0Alexander Viro <viro@zeniv.linux.org.uk>" linux-fsdevel@vger.kernel.org @@ -53,10 +53,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" @@ -80,11 +80,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" @@ -115,4 +115,4 @@ "-- \n" Omar -b34b368181bf6aa703fb020b694232957985f4b973a2f027faec0e237337b503 +bd4f0df1b3c0617deb402ce24b65d7433e5b3cf215c0d26145e5ff843d3b0bb2
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.