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
Merge branch develop-3.10
[firefly-linux-kernel-4.4.55.git]
/
fs
/
ocfs2
/
dlmglue.c
diff --git
a/fs/ocfs2/dlmglue.c
b/fs/ocfs2/dlmglue.c
index 12ae194ac9431ba82755d0d5020a385f25d4afa9..3a44a648dae7709b1cd5431c426cf3b9e057e54a 100644
(file)
--- a/
fs/ocfs2/dlmglue.c
+++ b/
fs/ocfs2/dlmglue.c
@@
-2322,7
+2322,7
@@
int ocfs2_inode_lock_full_nested(struct inode *inode,
status = __ocfs2_cluster_lock(osb, lockres, level, dlm_flags,
arg_flags, subclass, _RET_IP_);
if (status < 0) {
- if (status != -EAGAIN
&& status != -EIOCBRETRY
)
+ if (status != -EAGAIN)
mlog_errno(status);
goto bail;
}