Commit 0c27362998a8357f199501aa401e99c51c2eb46e

Authored by Jeff Layton
1 parent 962bd40bc3

locks: set fl_owner for leases back to current->files

This fixes a regression due to commit 130d1f956ab3 (locks: ensure that
fl_owner is always initialized properly in flock and lease codepaths). I
had mistakenly thought that the fl_owner wasn't used in the lease code,
but I missed the place in __break_lease that does use it.

The i_have_this_lease check in generic_add_lease uses it. While I'm not
sure that check is terribly helpful [1], reset it back to using
current->files in order to ensure that there's no behavior change here.

[1]: leases are owned by the file description. It's possible that this
     is a threaded program, and the lease breaker and the task that
     would handle the signal are different, even if they have the same
     file table. So, there is the potential for false positives with
     this check.

Fixes: 130d1f956ab3 (locks: ensure that fl_owner is always initialized properly in flock and lease codepaths)
Signed-off-by: Jeff Layton <jlayton@primarydata.com>

Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff

... ... @@ -431,7 +431,7 @@
431 431 if (assign_type(fl, type) != 0)
432 432 return -EINVAL;
433 433  
434   - fl->fl_owner = (fl_owner_t)filp;
  434 + fl->fl_owner = (fl_owner_t)current->files;
435 435 fl->fl_pid = current->tgid;
436 436  
437 437 fl->fl_file = filp;