lkml.org 
[lkml]   [2020]   [Jul]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH 2/2] lib/test_lockup.c: Fix return value of test_lockup_init()
From
Date
On 7/23/20 6:50 PM, Tiezhu Yang wrote:
> Since filp_open() returns an error pointer, we should use IS_ERR() to
> check the return value and then return PTR_ERR() if failed to get the
> actual return value instead of always -EINVAL.
>
> E.g. without this patch:
>
> [root@localhost loongson]# ls no_such_file
> ls: cannot access no_such_file: No such file or directory
> [root@localhost loongson]# modprobe test_lockup file_path=no_such_file lock_sb_umount time_secs=60 state=S
> modprobe: ERROR: could not insert 'test_lockup': Invalid argument
> [root@localhost loongson]# dmesg | tail -1
> [ 126.100596] test_lockup: cannot find file_path
>
> With this patch:
>
> [root@localhost loongson]# ls no_such_file
> ls: cannot access no_such_file: No such file or directory
> [root@localhost loongson]# modprobe test_lockup file_path=no_such_file lock_sb_umount time_secs=60 state=S
> modprobe: ERROR: could not insert 'test_lockup': Unknown symbol in module, or unknown parameter (see dmesg)
> [root@localhost loongson]# dmesg | tail -1
> [ 95.134362] test_lockup: failed to open no_such_file: -2
>
> Fixes: aecd42df6d39 ("lib/test_lockup.c: add parameters for locking generic vfs locks")
> Signed-off-by: Tiezhu Yang <yangtiezhu@loongson.cn>

Reviewed-by: Guenter Roeck <linux@roeck-us.net>

> ---
> lib/test_lockup.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/lib/test_lockup.c b/lib/test_lockup.c
> index bd7c7ff..e720276 100644
> --- a/lib/test_lockup.c
> +++ b/lib/test_lockup.c
> @@ -512,8 +512,8 @@ static int __init test_lockup_init(void)
> if (test_file_path[0]) {
> test_file = filp_open(test_file_path, O_RDONLY, 0);
> if (IS_ERR(test_file)) {
> - pr_err("cannot find file_path\n");
> - return -EINVAL;
> + pr_err("failed to open %s: %ld\n", test_file_path, PTR_ERR(test_file));
> + return PTR_ERR(test_file);
> }
> test_inode = file_inode(test_file);
> } else if (test_lock_inode ||
>

\
 
 \ /
  Last update: 2020-07-24 04:12    [W:0.039 / U:0.672 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site