openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

locks: make "added" in __posix_lock_file a bool 

Signed-off-by: Jeff Layton <jlayton@redhat.com>
Acked-by: J. Bruce Fields <bfields@fieldses.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Jeff Layton 2013-06-21 08:58:13 -04:00 committed by Al Viro
parent 1cb3601259
commit b9746ef80f
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fs/locks.c
View File

@ -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 *left = NULL;
struct file_lock *right = NULL; struct file_lock *right = NULL;
struct file_lock **before; struct file_lock **before;
int error, added = 0; int error;
bool added = false;
/* /*
* We may need two file_lock structures for this operation, * 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; continue;
} }
request = fl; request = fl;
added = 1; added = true;
} }
else { else {
/* Processing for different lock types is a bit /* 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) if (fl->fl_start > request->fl_end)
break; break;
if (request->fl_type == F_UNLCK) if (request->fl_type == F_UNLCK)
added = 1; added = true;
if (fl->fl_start < request->fl_start) if (fl->fl_start < request->fl_start)
left = fl; left = fl;
/* If the next lock in the list has a higher end /* 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_release_private(fl);
locks_copy_private(fl, request); locks_copy_private(fl, request);
request = fl; request = fl;
added = 1; added = true;
} }
} }
/* Go on to next lock. /* Go on to next lock.