From: Jeff Layton Date: Fri, 21 Jun 2013 12:58:13 +0000 (-0400) Subject: locks: make "added" in __posix_lock_file a bool X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b9746ef80fa6963998866c1b6269c9cf3e9ea188;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git locks: make "added" in __posix_lock_file a bool Signed-off-by: Jeff Layton Acked-by: J. Bruce Fields Signed-off-by: Al Viro --- diff --git a/fs/locks.c b/fs/locks.c index ddeab49fe2be..1d6cb28816be 100644 --- a/fs/locks.c +++ b/fs/locks.c @@ -791,7 +791,8 @@ static int __posix_lock_file(struct inode *inode, struct file_lock *request, str struct file_lock *left = NULL; struct file_lock *right = NULL; struct file_lock **before; - int error, added = 0; + int error; + bool added = false; /* * We may need two file_lock structures for this operation, @@ -885,7 +886,7 @@ static int __posix_lock_file(struct inode *inode, struct file_lock *request, str continue; } request = fl; - added = 1; + added = true; } else { /* Processing for different lock types is a bit @@ -896,7 +897,7 @@ static int __posix_lock_file(struct inode *inode, struct file_lock *request, str if (fl->fl_start > request->fl_end) break; if (request->fl_type == F_UNLCK) - added = 1; + added = true; if (fl->fl_start < request->fl_start) left = fl; /* If the next lock in the list has a higher end @@ -926,7 +927,7 @@ static int __posix_lock_file(struct inode *inode, struct file_lock *request, str locks_release_private(fl); locks_copy_private(fl, request); request = fl; - added = 1; + added = true; } } /* Go on to next lock.