Skip to content

Commit 2079872

Browse files
committed
backport patch for 6.13 to 6.8 (min() and max() changed)
1 parent 2254522 commit 2079872

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

fs/fuse/file.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1471,8 +1471,8 @@ static void check_and_add_locked_area(struct fuse_inode *fi, loff_t offset, size
14711471

14721472
/* if we have overlap, extend the locked area */
14731473
if (lock_start_offset >= current_area_start_offset && lock_start_offset <= current_area_end_offset) {
1474-
area->offset = MIN(current_area_start_offset, lock_start_offset);
1475-
area->size = MAX(current_area_end_offset, lock_end_offset) - area->offset;
1474+
area->offset = min(current_area_start_offset, lock_start_offset);
1475+
area->size = max(current_area_end_offset, lock_end_offset) - area->offset;
14761476
spin_unlock(&fi->lock);
14771477
return;
14781478
}

0 commit comments

Comments
 (0)