projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drm/radeon: do not move bo to different placement at each cs
[firefly-linux-kernel-4.4.55.git]
/
fs
/
locks.c
diff --git
a/fs/locks.c
b/fs/locks.c
index abc7dc6c490b6dc7ca6e9119c585dc10b1a2d3d9..a94e331a52a2febbf46a4df702156c1a013b2990 100644
(file)
--- a/
fs/locks.c
+++ b/
fs/locks.c
@@
-1289,7
+1289,7
@@
EXPORT_SYMBOL(__break_lease);
void lease_get_mtime(struct inode *inode, struct timespec *time)
{
struct file_lock *flock = inode->i_flock;
void lease_get_mtime(struct inode *inode, struct timespec *time)
{
struct file_lock *flock = inode->i_flock;
- if (flock && IS_LEASE(flock) && (flock->fl_type
&
F_WRLCK))
+ if (flock && IS_LEASE(flock) && (flock->fl_type
==
F_WRLCK))
*time = current_fs_time(inode->i_sb);
else
*time = inode->i_mtime;
*time = current_fs_time(inode->i_sb);
else
*time = inode->i_mtime;
@@
-2185,8
+2185,8
@@
static void lock_get_status(struct seq_file *f, struct file_lock *fl,
} else {
seq_printf(f, "%s ",
(lease_breaking(fl))
} else {
seq_printf(f, "%s ",
(lease_breaking(fl))
- ? (fl->fl_type
&
F_UNLCK) ? "UNLCK" : "READ "
- : (fl->fl_type
&
F_WRLCK) ? "WRITE" : "READ ");
+ ? (fl->fl_type
==
F_UNLCK) ? "UNLCK" : "READ "
+ : (fl->fl_type
==
F_WRLCK) ? "WRITE" : "READ ");
}
if (inode) {
#ifdef WE_CAN_BREAK_LSLK_NOW
}
if (inode) {
#ifdef WE_CAN_BREAK_LSLK_NOW