diff for duplicates of <20151110221441.GA30281@mwanda> diff --git a/a/1.txt b/N1/1.txt index 0635e9a..b8e92ca 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -15,10 +15,10 @@ index 79b1130..ebf45d2 100644 switch (rqdata.cmd) { case NCP_LOCK_EX: case NCP_LOCK_SH: -- if (rqdata.timeout = 0) +- if (rqdata.timeout == 0) + if (rqdata.timeout < 0) + return -EINVAL; -+ else if (rqdata.timeout = 0) ++ else if (rqdata.timeout == 0) rqdata.timeout = NCP_LOCK_DEFAULT_TIMEOUT; else if (rqdata.timeout > NCP_LOCK_MAX_TIMEOUT) rqdata.timeout = NCP_LOCK_MAX_TIMEOUT; diff --git a/a/content_digest b/N1/content_digest index 1d1bff8..2e7b11d 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020151110091923.GE26699@quack.suse.cz\0" "From\0Dan Carpenter <dan.carpenter@oracle.com>\0" "Subject\0[patch v2] ncpfs: don't allow negative timeouts\0" - "Date\0Tue, 10 Nov 2015 22:14:41 +0000\0" + "Date\0Wed, 11 Nov 2015 01:14:41 +0300\0" "To\0Petr Vandrovec <petr@vandrovec.name>\0" "Cc\0David Howells <dhowells@redhat.com>" Jan Kara <jack@suse.cz> @@ -28,12 +28,12 @@ " \t\t\tswitch (rqdata.cmd) {\n" " \t\t\t\tcase NCP_LOCK_EX:\n" " \t\t\t\tcase NCP_LOCK_SH:\n" - "-\t\t\t\t\t\tif (rqdata.timeout = 0)\n" + "-\t\t\t\t\t\tif (rqdata.timeout == 0)\n" "+\t\t\t\t\t\tif (rqdata.timeout < 0)\n" "+\t\t\t\t\t\t\treturn -EINVAL;\n" - "+\t\t\t\t\t\telse if (rqdata.timeout = 0)\n" + "+\t\t\t\t\t\telse if (rqdata.timeout == 0)\n" " \t\t\t\t\t\t\trqdata.timeout = NCP_LOCK_DEFAULT_TIMEOUT;\n" " \t\t\t\t\t\telse if (rqdata.timeout > NCP_LOCK_MAX_TIMEOUT)\n" " \t\t\t\t\t\t\trqdata.timeout = NCP_LOCK_MAX_TIMEOUT;" -98f7c29e34a352ccbabc8e388c69b8ff323c256fe7e9ec09942ad9f3bc82dc44 +6db55b4b958f3d382006ab00800421eea13fb6bb24c62b081731c147850a9ea6
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.