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
Changed quotes for newer bash
[fs/lustre-release.git]
/
lustre
/
mds
/
mds_unlink_open.c
diff --git
a/lustre/mds/mds_unlink_open.c
b/lustre/mds/mds_unlink_open.c
index
28fe66d
..
c480885
100644
(file)
--- a/
lustre/mds/mds_unlink_open.c
+++ b/
lustre/mds/mds_unlink_open.c
@@
-83,8
+83,10
@@
mds_unlink_object(struct mds_obd *mds, struct inode *inode,
CDEBUG(D_INODE, "destroy OSS object %d/%d\n",
(int)oa->o_id, (int)oa->o_gr);
CDEBUG(D_INODE, "destroy OSS object %d/%d\n",
(int)oa->o_id, (int)oa->o_gr);
+
+ if (async)
+ oti.oti_flags |= OBD_MODE_ASYNC;
- oti.oti_async = async;
rc = obd_destroy(mds->mds_dt_exp, oa, lsm, &oti);
obdo_free(oa);
out_free_memmd:
rc = obd_destroy(mds->mds_dt_exp, oa, lsm, &oti);
obdo_free(oa);
out_free_memmd:
@@
-241,12
+243,6
@@
int mds_cleanup_orphans(struct obd_device *obd)
CWARN("orphan %s re-opened during recovery\n", d_name);
GOTO(next, rc = 0);
}
CWARN("orphan %s re-opened during recovery\n", d_name);
GOTO(next, rc = 0);
}
- if (!mds_inode_is_orphan(child_inode)) {
- UP_READ_I_ALLOC_SEM(child_inode);
- CWARN("orphan %s has been removed by CLOSE\n", d_name);
- GOTO(next, rc = 0);
- }
- mds_inode_unset_orphan(child_inode);
UP_READ_I_ALLOC_SEM(child_inode);
rc = mds_unlink_orphan(obd, dchild, child_inode, pending_dir);
if (rc == 0) {
UP_READ_I_ALLOC_SEM(child_inode);
rc = mds_unlink_orphan(obd, dchild, child_inode, pending_dir);
if (rc == 0) {