forked from luck/tmp_suning_uos_patched
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:
parent
1cb3601259
commit
b9746ef80f
|
@ -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.
|
||||
|
|
Loading…
Reference in New Issue
Block a user