From: Allison Henderson <allison.henderson@xxxxxxxxxx>
This patch removes the old parent pointer attribute during the rename
operation, and re-adds the updated parent pointer.
Signed-off-by: Allison Henderson <allison.henderson@xxxxxxxxxx>
Reviewed-by: Darrick J. Wong <djwong@xxxxxxxxxx>
[djwong: adjust to new ondisk format]
Signed-off-by: Darrick J. Wong <djwong@xxxxxxxxxx>
---
fs/xfs/libxfs/xfs_attr.c | 2 +
fs/xfs/libxfs/xfs_attr.h | 1 +
fs/xfs/libxfs/xfs_parent.c | 68 ++++++++++++++++++++++++++++++++--
fs/xfs/libxfs/xfs_parent.h | 23 +++++++++++-
fs/xfs/libxfs/xfs_trans_space.c | 25 +++++++++++++
fs/xfs/libxfs/xfs_trans_space.h | 6 ++-
fs/xfs/scrub/orphanage.c | 4 +-
fs/xfs/scrub/parent_repair.c | 3 +-
fs/xfs/xfs_inode.c | 78 ++++++++++++++++++++++++++++++++++++---
9 files changed, 190 insertions(+), 20 deletions(-)
diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c
index 5dcf5ffaa02d..3781dff605ba 100644
--- a/fs/xfs/libxfs/xfs_attr.c
+++ b/fs/xfs/libxfs/xfs_attr.c
@@ -936,7 +936,7 @@ xfs_attr_defer_add(
}
/* Sets an attribute for an inode as a deferred operation */
-static int
+int
xfs_attr_defer_replace(
struct xfs_da_args *args)
{
diff --git a/fs/xfs/libxfs/xfs_attr.h b/fs/xfs/libxfs/xfs_attr.h
index 06b6494511db..24616bb07e9f 100644
--- a/fs/xfs/libxfs/xfs_attr.h
+++ b/fs/xfs/libxfs/xfs_attr.h
@@ -551,6 +551,7 @@ int xfs_attr_get_ilocked(struct xfs_da_args *args);
int xfs_attr_get(struct xfs_da_args *args);
int xfs_attr_defer_add(struct xfs_da_args *args);
int xfs_attr_defer_remove(struct xfs_da_args *args);
+int xfs_attr_defer_replace(struct xfs_da_args *args);
int xfs_attr_set(struct xfs_da_args *args);
int xfs_attr_set_iter(struct xfs_attr_intent *attr);
int xfs_attr_remove_iter(struct xfs_attr_intent *attr);
diff --git a/fs/xfs/libxfs/xfs_parent.c b/fs/xfs/libxfs/xfs_parent.c
index 8895b132fd23..544a9ba743f2 100644
--- a/fs/xfs/libxfs/xfs_parent.c
+++ b/fs/xfs/libxfs/xfs_parent.c
@@ -117,6 +117,19 @@ xfs_init_parent_davalue(
args->value = (void *)name->name;
}
+/*
+ * Point the da args new value fields at the non-key parts of a replacement
+ * parent pointer.
+ */
+static inline void
+xfs_init_parent_danewvalue(
+ struct xfs_da_args *args,
+ const struct xfs_name *name)
+{
+ args->new_valuelen = name->len;
+ args->new_value = (void *)name->name;
+}
+
/*
* Allocate memory to control a logged parent pointer update as part of a
* dirent operation.
@@ -124,22 +137,27 @@ xfs_init_parent_davalue(
int
__xfs_parent_init(
struct xfs_mount *mp,
+ bool grab_log,
struct xfs_parent_defer **parentp)
{
struct xfs_parent_defer *parent;
int error;
- error = xfs_attr_grab_log_assist(mp);
- if (error)
- return error;
+ if (grab_log) {
+ error = xfs_attr_grab_log_assist(mp);
+ if (error)
+ return error;
+ }
parent = kmem_cache_zalloc(xfs_parent_intent_cache, GFP_KERNEL);
if (!parent) {
- xfs_attr_rele_log_assist(mp);
+ if (grab_log)
+ xfs_attr_rele_log_assist(mp);
return -ENOMEM;
}
/* init parent da_args */
+ parent->have_log = grab_log;
parent->args.geo = mp->m_attr_geo;
parent->args.whichfork = XFS_ATTR_FORK;
parent->args.attr_filter = XFS_ATTR_PARENT;
@@ -215,12 +233,52 @@ xfs_parent_remove(
return xfs_attr_defer_remove(args);
}
+/* Replace one parent pointer with another to reflect a rename. */
+int
+xfs_parent_replace(
+ struct xfs_trans *tp,
+ struct xfs_parent_defer *parent,
+ struct xfs_inode *old_dp,
+ const struct xfs_name *old_name,
+ struct xfs_inode *new_dp,
+ const struct xfs_name *new_name,
+ struct xfs_inode *child)
+{
+ struct xfs_da_args *args = &parent->args;
+
+ /*
+ * For regular attrs, replacing an attr from a !hasattr inode becomes
+ * an attr-set operation. For replacing a parent pointer, however, we
+ * require that the old pointer must exist.
+ */
+ if (XFS_IS_CORRUPT(child->i_mount, !xfs_inode_hasattr(child))) {
+ xfs_inode_mark_sick(child, XFS_SICK_INO_PARENT);
+ return -EFSCORRUPTED;
+ }
+
+ xfs_init_parent_name_rec(&parent->rec, old_dp, old_name, child);
+ args->hashval = xfs_parent_hashname(old_dp, parent);
+
+ xfs_init_parent_name_rec(&parent->new_rec, new_dp, new_name, child);
+ args->new_name = (const uint8_t *)&parent->new_rec;
+ args->new_namelen = sizeof(struct xfs_parent_name_rec);
+
+ args->trans = tp;
+ args->dp = child;
+
+ xfs_init_parent_davalue(&parent->args, old_name);
+ xfs_init_parent_danewvalue(&parent->args, new_name);
+
+ return xfs_attr_defer_replace(args);
+}
+
/* Cancel a parent pointer operation. */
void
__xfs_parent_cancel(
struct xfs_mount *mp,
struct xfs_parent_defer *parent)
{
- xlog_drop_incompat_feat(mp->m_log, XLOG_INCOMPAT_FEAT_XATTRS);
+ if (parent->have_log)
+ xlog_drop_incompat_feat(mp->m_log, XLOG_INCOMPAT_FEAT_XATTRS);
kmem_cache_free(xfs_parent_intent_cache, parent);
}
diff --git a/fs/xfs/libxfs/xfs_parent.h b/fs/xfs/libxfs/xfs_parent.h
index 19532935f6c6..637f99fba9dc 100644
--- a/fs/xfs/libxfs/xfs_parent.h
+++ b/fs/xfs/libxfs/xfs_parent.h
@@ -21,10 +21,13 @@ extern struct kmem_cache *xfs_parent_intent_cache;
*/
struct xfs_parent_defer {
struct xfs_parent_name_rec rec;
+ struct xfs_parent_name_rec new_rec;
struct xfs_da_args args;
+ bool have_log;
};
-int __xfs_parent_init(struct xfs_mount *mp, struct xfs_parent_defer **parentp);
+int __xfs_parent_init(struct xfs_mount *mp, bool grab_log,
+ struct xfs_parent_defer **parentp);
static inline int
xfs_parent_start(
@@ -34,7 +37,19 @@ xfs_parent_start(
*pp = NULL;
if (xfs_has_parent(mp))
- return __xfs_parent_init(mp, pp);
+ return __xfs_parent_init(mp, true, pp);
+ return 0;
+}
+
+static inline int
+xfs_parent_start_locked(
+ struct xfs_mount *mp,
+ struct xfs_parent_defer **pp)
+{
+ *pp = NULL;
+
+ if (xfs_has_parent(mp))
+ return __xfs_parent_init(mp, false, pp);
return 0;
}
@@ -44,6 +59,10 @@ int xfs_parent_add(struct xfs_trans *tp, struct xfs_parent_defer *parent,
int xfs_parent_remove(struct xfs_trans *tp, struct xfs_parent_defer *parent,
struct xfs_inode *dp, const struct xfs_name *parent_name,
struct xfs_inode *child);
+int xfs_parent_replace(struct xfs_trans *tp, struct xfs_parent_defer *parent,
+ struct xfs_inode *old_dp, const struct xfs_name *old_name,
+ struct xfs_inode *new_dp, const struct xfs_name *new_name,
+ struct xfs_inode *child);
void __xfs_parent_cancel(struct xfs_mount *mp, struct xfs_parent_defer *parent);
diff --git a/fs/xfs/libxfs/xfs_trans_space.c b/fs/xfs/libxfs/xfs_trans_space.c
index df729e4f1a4c..b9dc3752f702 100644
--- a/fs/xfs/libxfs/xfs_trans_space.c
+++ b/fs/xfs/libxfs/xfs_trans_space.c
@@ -94,3 +94,28 @@ xfs_remove_space_res(
return ret;
}
+
+unsigned int
+xfs_rename_space_res(
+ struct xfs_mount *mp,
+ unsigned int src_namelen,
+ bool target_exists,
+ unsigned int target_namelen,
+ bool has_whiteout)
+{
+ unsigned int ret;
+
+ ret = XFS_DIRREMOVE_SPACE_RES(mp) +
+ XFS_DIRENTER_SPACE_RES(mp, target_namelen);
+
+ if (xfs_has_parent(mp)) {
+ if (has_whiteout)
+ ret += xfs_parent_calc_space_res(mp, src_namelen);
+ ret += 2 * xfs_parent_calc_space_res(mp, target_namelen);
+ }
+
+ if (target_exists)
+ ret += xfs_parent_calc_space_res(mp, target_namelen);
+
+ return ret;
+}
diff --git a/fs/xfs/libxfs/xfs_trans_space.h b/fs/xfs/libxfs/xfs_trans_space.h
index a4490813c56f..1155ff2d37e2 100644
--- a/fs/xfs/libxfs/xfs_trans_space.h
+++ b/fs/xfs/libxfs/xfs_trans_space.h
@@ -91,8 +91,6 @@
XFS_DQUOT_CLUSTER_SIZE_FSB)
#define XFS_QM_QINOCREATE_SPACE_RES(mp) \
XFS_IALLOC_SPACE_RES(mp)
-#define XFS_RENAME_SPACE_RES(mp,nl) \
- (XFS_DIRREMOVE_SPACE_RES(mp) + XFS_DIRENTER_SPACE_RES(mp,nl))
#define XFS_IFREE_SPACE_RES(mp) \
(xfs_has_finobt(mp) ? M_IGEO(mp)->inobt_maxlevels : 0)
@@ -106,4 +104,8 @@ unsigned int xfs_symlink_space_res(struct xfs_mount *mp, unsigned int namelen,
unsigned int fsblocks);
unsigned int xfs_remove_space_res(struct xfs_mount *mp, unsigned int namelen);
+unsigned int xfs_rename_space_res(struct xfs_mount *mp,
+ unsigned int src_namelen, bool target_exists,
+ unsigned int target_namelen, bool has_whiteout);
+
#endif /* __XFS_TRANS_SPACE_H__ */
diff --git a/fs/xfs/scrub/orphanage.c b/fs/xfs/scrub/orphanage.c
index 2a093eb08f2a..8285d129db9e 100644
--- a/fs/xfs/scrub/orphanage.c
+++ b/fs/xfs/scrub/orphanage.c
@@ -264,8 +264,8 @@ xrep_adoption_init(
adopt->sc = sc;
adopt->orphanage_blkres = xfs_link_space_res(mp, MAXNAMELEN);
if (S_ISDIR(VFS_I(sc->ip)->i_mode))
- child_blkres = XFS_RENAME_SPACE_RES(sc->mp,
- xfs_name_dotdot.len);
+ child_blkres = xfs_rename_space_res(mp, 0, false,
+ xfs_name_dotdot.len, false);
adopt->child_blkres = child_blkres;
return 0;
}
diff --git a/fs/xfs/scrub/parent_repair.c b/fs/xfs/scrub/parent_repair.c
index e0ac7336c1ac..b57ba7559361 100644
--- a/fs/xfs/scrub/parent_repair.c
+++ b/fs/xfs/scrub/parent_repair.c
@@ -169,7 +169,8 @@ xrep_parent_reset_dotdot(
* Reserve more space just in case we have to expand the dir. We're
* allowed to exceed quota to repair inconsistent metadata.
*/
- spaceres = XFS_RENAME_SPACE_RES(sc->mp, xfs_name_dotdot.len);
+ spaceres = xfs_rename_space_res(sc->mp, 0, false, xfs_name_dotdot.len,
+ false);
error = xfs_trans_reserve_more_inode(sc->tp, sc->ip, spaceres, 0,
true);
if (error)
diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
index 9e8538da113c..967a21045583 100644
--- a/fs/xfs/xfs_inode.c
+++ b/fs/xfs/xfs_inode.c
@@ -3057,6 +3057,9 @@ xfs_rename(
int spaceres;
bool retried = false;
int error, nospace_error = 0;
+ struct xfs_parent_defer *src_ip_pptr = NULL;
+ struct xfs_parent_defer *tgt_ip_pptr = NULL;
+ struct xfs_parent_defer *wip_pptr = NULL;
trace_xfs_rename(src_dp, target_dp, src_name, target_name);
@@ -3081,9 +3084,26 @@ xfs_rename(
xfs_sort_for_rename(src_dp, target_dp, src_ip, target_ip, wip,
inodes, &num_inodes);
+ error = xfs_parent_start(mp, &src_ip_pptr);
+ if (error)
+ goto out_release_wip;
+
+ if (wip) {
+ error = xfs_parent_start_locked(mp, &wip_pptr);
+ if (error)
+ goto out_src_ip_pptr;
+ }
+
+ if (target_ip) {
+ error = xfs_parent_start_locked(mp, &tgt_ip_pptr);
+ if (error)
+ goto out_wip_pptr;
+ }
+
retry:
nospace_error = 0;
- spaceres = XFS_RENAME_SPACE_RES(mp, target_name->len);
+ spaceres = xfs_rename_space_res(mp, src_name->len, target_ip != NULL,
+ target_name->len, wip != NULL);
error = xfs_trans_alloc(mp, &M_RES(mp)->tr_rename, spaceres, 0, 0, &tp);
if (error == -ENOSPC) {
nospace_error = error;
@@ -3092,7 +3112,17 @@ xfs_rename(
&tp);
}
if (error)
- goto out_release_wip;
+ goto out_tgt_ip_pptr;
+
+ /*
+ * We don't allow reservationless renaming when parent pointers are
+ * enabled because we can't back out if the xattrs must grow.
+ */
+ if (src_ip_pptr && nospace_error) {
+ error = nospace_error;
+ xfs_trans_cancel(tp);
+ goto out_tgt_ip_pptr;
+ }
/*
* Attach the dquots to the inodes
@@ -3100,7 +3130,7 @@ xfs_rename(
error = xfs_qm_vop_rename_dqattach(inodes);
if (error) {
xfs_trans_cancel(tp);
- goto out_release_wip;
+ goto out_tgt_ip_pptr;
}
/*
@@ -3169,6 +3199,15 @@ xfs_rename(
goto out_trans_cancel;
}
+ /*
+ * We don't allow quotaless renaming when parent pointers are enabled
+ * because we can't back out if the xattrs must grow.
+ */
+ if (src_ip_pptr && nospace_error) {
+ error = nospace_error;
+ goto out_trans_cancel;
+ }
+
/*
* Check for expected errors before we dirty the transaction
* so we can return an error without a transaction abort.
@@ -3361,6 +3400,26 @@ xfs_rename(
if (error)
goto out_trans_cancel;
+ if (wip_pptr) {
+ error = xfs_parent_add(tp, wip_pptr, src_dp, src_name, wip);
+ if (error)
+ goto out_trans_cancel;
+ }
+
+ if (src_ip_pptr) {
+ error = xfs_parent_replace(tp, src_ip_pptr, src_dp, src_name,
+ target_dp, target_name, src_ip);
+ if (error)
+ goto out_trans_cancel;
+ }
+
+ if (tgt_ip_pptr) {
+ error = xfs_parent_remove(tp, tgt_ip_pptr, target_dp,
+ target_name, target_ip);
+ if (error)
+ goto out_trans_cancel;
+ }
+
xfs_trans_ichgtime(tp, src_dp, XFS_ICHGTIME_MOD | XFS_ICHGTIME_CHG);
xfs_trans_log_inode(tp, src_dp, XFS_ILOG_CORE);
if (new_parent)
@@ -3382,14 +3441,19 @@ xfs_rename(
xfs_dir_update_hook(src_dp, wip, 1, src_name);
error = xfs_finish_rename(tp);
- xfs_iunlock_rename(inodes, num_inodes);
- if (wip)
- xfs_irele(wip);
- return error;
+ nospace_error = 0;
+ goto out_unlock;
out_trans_cancel:
xfs_trans_cancel(tp);
+out_unlock:
xfs_iunlock_rename(inodes, num_inodes);
+out_tgt_ip_pptr:
+ xfs_parent_finish(mp, tgt_ip_pptr);
+out_wip_pptr:
+ xfs_parent_finish(mp, wip_pptr);
+out_src_ip_pptr:
+ xfs_parent_finish(mp, src_ip_pptr);
out_release_wip:
if (wip)
xfs_irele(wip);
