diff --git a/[refs] b/[refs] index 0d4cb6a7d355..5af763df9c25 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c45821d263a8a5109d69a9e8942b8d65bcd5f31a +refs/heads/master: 255c7cf810e4776ae8f1023332060459f30d8a2a diff --git a/trunk/fs/locks.c b/trunk/fs/locks.c index 5cb65062281a..feaac634d0da 100644 --- a/trunk/fs/locks.c +++ b/trunk/fs/locks.c @@ -1399,7 +1399,7 @@ int generic_setlease(struct file *filp, long arg, struct file_lock **flp) for (before = &inode->i_flock; ((fl = *before) != NULL) && IS_LEASE(fl); before = &fl->fl_next) { - if (fl->fl_file == lease->fl_file) + if (fl->fl_file == filp) my_before = before; else if (fl->fl_type == (F_INPROGRESS | F_UNLCK)) /*