lkml.org 
[lkml]   [2018]   [Jul]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: [RFC][PATCH 15/42] lift fput() on late failures into path_openat()
On Wed, Jul 11, 2018 at 5:21 AM, Al Viro <viro@zeniv.linux.org.uk> wrote:
[...]
> @@ -3407,8 +3407,6 @@ static int do_last(struct nameidata *nd,
> if (!error && will_truncate)
> error = handle_truncate(file);
> out:
> - if (unlikely(error) && (*opened & FILE_OPENED))
> - fput(file);
> if (unlikely(error > 0)) {
> WARN_ON(1);

Another opportunity to squash WARN_ON(1) with condition.

> error = -EINVAL;
> @@ -3484,8 +3482,6 @@ static int do_tmpfile(struct nameidata *nd, unsigned flags,
> if (error)
> goto out2;
> error = open_check_o_direct(file);
> - if (error)
> - fput(file);
> out2:
> mnt_drop_write(path.mnt);
> out:
> @@ -3547,20 +3543,20 @@ static struct file *path_openat(struct nameidata *nd,
> }
> terminate_walk(nd);
> out2:
> - if (!(opened & FILE_OPENED)) {
> - BUG_ON(!error);
> - fput(file);
> + if (likely(!error)) {
> + if (likely(opened & FILE_OPENED))
> + return file;
> + WARN_ON(1);

This style may be open for debate but:

if (!WARN_ON(!(opened & FILE_OPENED)))
return file;

Maybe we need WARN_UNLESS() or WARN_ASSERT()

Thanks,
Amir.

\
 
 \ /
  Last update: 2018-07-11 07:43    [W:0.184 / U:1.152 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site