@@ -2577,6 +2577,7 @@ xfs_remove(
int is_dir = S_ISDIR(VFS_I(ip)->i_mode);
int error = 0;
uint resblks;
+ xfs_dir2_dataptr_t dir_offset;
trace_xfs_remove(dp, name);
@@ -2614,8 +2615,8 @@ xfs_remove(
xfs_lock_two_inodes(dp, XFS_ILOCK_EXCL, ip, XFS_ILOCK_EXCL);
- xfs_trans_ijoin(tp, dp, XFS_ILOCK_EXCL);
- xfs_trans_ijoin(tp, ip, XFS_ILOCK_EXCL);
+ xfs_trans_ijoin(tp, dp, 0);
+ xfs_trans_ijoin(tp, ip, 0);
/*
* If we're removing a directory perform some additional validation.
@@ -2655,12 +2656,18 @@ xfs_remove(
if (error)
goto out_trans_cancel;
- error = xfs_dir_removename(tp, dp, name, ip->i_ino, resblks, NULL);
+ error = xfs_dir_removename(tp, dp, name, ip->i_ino, resblks, &dir_offset);
if (error) {
ASSERT(error != -ENOENT);
goto out_trans_cancel;
}
+ if (xfs_sb_version_hasparent(&mp->m_sb)) {
+ error = xfs_parent_remove_deferred(dp, tp, ip, dir_offset);
+ if (error)
+ goto out_trans_cancel;
+ }
+
/*
* If this is a synchronous mount, make sure that the
* remove transaction goes to disk before returning to
@@ -2671,15 +2678,20 @@ xfs_remove(
error = xfs_trans_commit(tp);
if (error)
- goto std_return;
+ goto out_unlock;
if (is_dir && xfs_inode_is_filestream(ip))
xfs_filestream_deassociate(ip);
+ xfs_iunlock(ip, XFS_ILOCK_EXCL);
+ xfs_iunlock(dp, XFS_ILOCK_EXCL);
return 0;
out_trans_cancel:
xfs_trans_cancel(tp);
+out_unlock:
+ xfs_iunlock(ip, XFS_ILOCK_EXCL);
+ xfs_iunlock(dp, XFS_ILOCK_EXCL);
std_return:
return error;
}
@@ -50,3 +50,21 @@ xfs_parent_add_deferred(
child_name->name, child_name->len, ATTR_PARENT);
}
+/*
+ * Remove a parent record from a child inode.
+ */
+int
+xfs_parent_remove_deferred(
+ struct xfs_inode *parent,
+ struct xfs_trans *tp,
+ struct xfs_inode *child,
+ xfs_dir2_dataptr_t diroffset)
+{
+ struct xfs_parent_name_rec rec;
+
+ xfs_init_parent_name_rec(&rec, parent, diroffset);
+
+ return xfs_attr_remove_deferred(child, tp, (const char *)&rec,
+ sizeof(rec), ATTR_PARENT);
+}
+
@@ -23,4 +23,8 @@
int xfs_parent_add_deferred(struct xfs_inode *parent, struct xfs_trans *tp,
struct xfs_inode *child, struct xfs_name *child_name,
uint32_t diroffset);
+int xfs_parent_remove_deferred(struct xfs_inode *parent,
+ struct xfs_trans *tp,
+ struct xfs_inode *child,
+ xfs_dir2_dataptr_t diroffset);
#endif /* __XFS_PARENT_UTILS_H__ */