diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-02-08 14:58:03 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-02-08 14:58:03 +1100 |
| commit | df36655e17d85aeab6efbb36096b4120d8d3ad73 (patch) | |
| tree | 6f0f80d42a96f03f9ff39e9b50b3344c5d6cf80e /fs/ocfs2/dlmglue.c | |
| parent | 61e5e6a7272e995083e4a23972aa9e0dc6e7d9ef (diff) | |
| parent | 830ddd56fdb4a32e7e7227cec0ee8ac1721fba45 (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'fs/ocfs2/dlmglue.c')
| -rw-r--r-- | fs/ocfs2/dlmglue.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ocfs2/dlmglue.c b/fs/ocfs2/dlmglue.c index 4f7795fb5fc0..bad2583881c8 100644 --- 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; } |