| Message ID | 20201125083933.2386059-1-huangguobin4@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | nfsd: Fix error return code in nfsd_file_cache_init() | expand |
On Wed, Nov 25, 2020 at 03:39:33AM -0500, Huang Guobin wrote: > Fix to return PTR_ERR() error code from the error handling case instead of > 0 in function nfsd_file_cache_init(), as done elsewhere in this function. > > Fixes: 65294c1f2c5e7("nfsd: add a new struct file caching facility to nfsd") > Signed-off-by: Huang Guobin <huangguobin4@huawei.com> > --- > fs/nfsd/filecache.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/fs/nfsd/filecache.c b/fs/nfsd/filecache.c > index c8b9d2667ee6..a8a5b555f08b 100644 > --- a/fs/nfsd/filecache.c > +++ b/fs/nfsd/filecache.c > @@ -686,6 +686,7 @@ nfsd_file_cache_init(void) > pr_err("nfsd: unable to create fsnotify group: %ld\n", > PTR_ERR(nfsd_file_fsnotify_group)); > nfsd_file_fsnotify_group = NULL; > + ret = PTR_ERR(nfsd_file_fsnotify_group); I think you meant to add that one line earlier. Otherwise fine, but it looks like an unlikely case so can probably wait for the merge window. --b. > goto out_notifier; > } > > -- > 2.22.0
> On Nov 25, 2020, at 9:17 AM, J. Bruce Fields <bfields@fieldses.org> wrote: > > On Wed, Nov 25, 2020 at 03:39:33AM -0500, Huang Guobin wrote: >> Fix to return PTR_ERR() error code from the error handling case instead of >> 0 in function nfsd_file_cache_init(), as done elsewhere in this function. >> >> Fixes: 65294c1f2c5e7("nfsd: add a new struct file caching facility to nfsd") >> Signed-off-by: Huang Guobin <huangguobin4@huawei.com> >> --- >> fs/nfsd/filecache.c | 1 + >> 1 file changed, 1 insertion(+) >> >> diff --git a/fs/nfsd/filecache.c b/fs/nfsd/filecache.c >> index c8b9d2667ee6..a8a5b555f08b 100644 >> --- a/fs/nfsd/filecache.c >> +++ b/fs/nfsd/filecache.c >> @@ -686,6 +686,7 @@ nfsd_file_cache_init(void) >> pr_err("nfsd: unable to create fsnotify group: %ld\n", >> PTR_ERR(nfsd_file_fsnotify_group)); >> nfsd_file_fsnotify_group = NULL; >> + ret = PTR_ERR(nfsd_file_fsnotify_group); > > I think you meant to add that one line earlier. > > Otherwise fine, but it looks like an unlikely case so can probably wait > for the merge window. Applied for the v5.11 merge window with Bruce's suggested change, and pushed to the cel-next branch in git://git.linux-nfs.org/projects/cel/cel-2.6.git or https://git.linux-nfs.org/?p=cel/cel-2.6.git;a=summary >> goto out_notifier; >> } >> >> -- >> 2.22.0 -- Chuck Lever
diff --git a/fs/nfsd/filecache.c b/fs/nfsd/filecache.c index c8b9d2667ee6..a8a5b555f08b 100644 --- a/fs/nfsd/filecache.c +++ b/fs/nfsd/filecache.c @@ -686,6 +686,7 @@ nfsd_file_cache_init(void) pr_err("nfsd: unable to create fsnotify group: %ld\n", PTR_ERR(nfsd_file_fsnotify_group)); nfsd_file_fsnotify_group = NULL; + ret = PTR_ERR(nfsd_file_fsnotify_group); goto out_notifier; }
Fix to return PTR_ERR() error code from the error handling case instead of 0 in function nfsd_file_cache_init(), as done elsewhere in this function. Fixes: 65294c1f2c5e7("nfsd: add a new struct file caching facility to nfsd") Signed-off-by: Huang Guobin <huangguobin4@huawei.com> --- fs/nfsd/filecache.c | 1 + 1 file changed, 1 insertion(+)