2020-01-22 10:26:41

by chenzhou

Subject: [PATCH -next] cifs: use PTR_ERR_OR_ZERO() to simplify code

PTR_ERR_OR_ZERO contains if(IS_ERR(...)) + PTR_ERR, just use
PTR_ERR_OR_ZERO directly.

Signed-off-by: Chen Zhou <[email protected]>
---
fs/cifs/dfs_cache.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/cifs/dfs_cache.c b/fs/cifs/dfs_cache.c
index 751c2fc..43c1b43 100644
--- a/fs/cifs/dfs_cache.c
+++ b/fs/cifs/dfs_cache.c
@@ -662,7 +662,7 @@ static int __dfs_cache_find(const unsigned int xid, struct cifs_ses *ses,
*/
if (noreq) {
up_read(&htable_rw_lock);
- return IS_ERR(ce) ? PTR_ERR(ce) : 0;
+ return PTR_ERR_OR_ZERO(ce);
}

if (!IS_ERR(ce)) {
--
2.7.4

2020-01-22 16:57:09

by Steve French

Subject: Re: [PATCH -next] cifs: use PTR_ERR_OR_ZERO() to simplify code

merged into cifs-2.6.git for-next

On Wed, Jan 22, 2020 at 4:25 AM Chen Zhou <[email protected]> wrote:
>
> PTR_ERR_OR_ZERO contains if(IS_ERR(...)) + PTR_ERR, just use
> PTR_ERR_OR_ZERO directly.
>
> Signed-off-by: Chen Zhou <[email protected]>
> ---
> fs/cifs/dfs_cache.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fs/cifs/dfs_cache.c b/fs/cifs/dfs_cache.c
> index 751c2fc..43c1b43 100644
> --- a/fs/cifs/dfs_cache.c
> +++ b/fs/cifs/dfs_cache.c
> @@ -662,7 +662,7 @@ static int __dfs_cache_find(const unsigned int xid, struct cifs_ses *ses,
> */
> if (noreq) {
> up_read(&htable_rw_lock);
> - return IS_ERR(ce) ? PTR_ERR(ce) : 0;
> + return PTR_ERR_OR_ZERO(ce);
> }
>
> if (!IS_ERR(ce)) {
> --
> 2.7.4
>


--
Thanks,

Steve