Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
LU-3285 mds: add IO locking to the MDC and MDT
[fs/lustre-release.git]
/
lustre
/
llite
/
file.c
diff --git
a/lustre/llite/file.c
b/lustre/llite/file.c
index
36e3a67
..
f2a7f1d
100644
(file)
--- a/
lustre/llite/file.c
+++ b/
lustre/llite/file.c
@@
-1024,7
+1024,7
@@
int ll_merge_attr(const struct lu_env *env, struct inode *inode)
cl_object_attr_unlock(obj);
if (rc != 0)
- GOTO(out_size_unlock, rc);
+ GOTO(out_size_unlock, rc
= (rc == -ENODATA ? 0 : rc)
);
if (atime < attr->cat_atime)
atime = attr->cat_atime;