projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rtc: palmas: Drop IRQF_EARLY_RESUME flag
[deliverable/linux.git]
/
fs
/
locks.c
diff --git
a/fs/locks.c
b/fs/locks.c
index af1ed74a657fbc93f64386bcad54d9826bc34684..7c5f91be9b65c4ddabe441d00bbda616ca0c2f26 100644
(file)
--- a/
fs/locks.c
+++ b/
fs/locks.c
@@
-1650,12
+1650,12
@@
generic_add_lease(struct file *filp, long arg, struct file_lock **flp, void **pr
* bother, maybe that's a sign this just isn't a good file to
* hand out a delegation on.
*/
* bother, maybe that's a sign this just isn't a good file to
* hand out a delegation on.
*/
- if (is_deleg && !
mutex_trylock(&inode->i_mutex
))
+ if (is_deleg && !
inode_trylock(inode
))
return -EAGAIN;
if (is_deleg && arg == F_WRLCK) {
/* Write delegations are not currently supported: */
return -EAGAIN;
if (is_deleg && arg == F_WRLCK) {
/* Write delegations are not currently supported: */
-
mutex_unlock(&inode->i_mutex
);
+
inode_unlock(inode
);
WARN_ON_ONCE(1);
return -EINVAL;
}
WARN_ON_ONCE(1);
return -EINVAL;
}
@@
-1732,7
+1732,7
@@
out:
spin_unlock(&ctx->flc_lock);
locks_dispose_list(&dispose);
if (is_deleg)
spin_unlock(&ctx->flc_lock);
locks_dispose_list(&dispose);
if (is_deleg)
-
mutex_unlock(&inode->i_mutex
);
+
inode_unlock(inode
);
if (!error && !my_fl)
*flp = NULL;
return error;
if (!error && !my_fl)
*flp = NULL;
return error;
This page took
0.024026 seconds
and
5
git commands to generate.