xfs: make the reserved block permission flag explicit in xfs_attr_set

Source kernel commit: bf61c36a45d4c215994699a7a06a00c58d22e8a2

Make the use of reserved blocks an explicit parameter to xfs_attr_set.
Userspace setting XFS_ATTR_ROOT attrs should continue to be able to use
it, but for online repairs we can back out and therefore do not care.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>

diff --git a/db/attrset.c b/db/attrset.c
index a59d5473e0327566814f7919e2f12e58bb2b1d8a..3b5db7c2aedb49f9d6efee2ce76da7d24e41f052 100644 (file)
--- a/db/attrset.c
+++ b/db/attrset.c
@@ -161,7 +161,7 @@ attr_set_f(
                goto out;
        }
 
-       if (libxfs_attr_set(&args, op)) {
+       if (libxfs_attr_set(&args, op, false)) {
                dbprintf(_("failed to set attr %s on inode %llu\n"),
                        args.name, (unsigned long long)iocur_top->ino);
                goto out;
@@ -247,7 +247,7 @@ attr_remove_f(
                goto out;
        }
 
-       if (libxfs_attr_set(&args, XFS_ATTRUPDATE_REMOVE)) {
+       if (libxfs_attr_set(&args, XFS_ATTRUPDATE_REMOVE, false)) {
                dbprintf(_("failed to remove attr %s from inode %llu\n"),
                        (unsigned char *)args.name,
                        (unsigned long long)iocur_top->ino);

diff --git a/libxfs/xfs_attr.c b/libxfs/xfs_attr.c
index 1034579a14b30a76097e9b7bd25b315793d0b1b5..32dd7bcf5de2de35c1f1b5a4f31371c16136ca88 100644 (file)
--- a/libxfs/xfs_attr.c
+++ b/libxfs/xfs_attr.c
@@ -951,7 +951,7 @@ xfs_attr_lookup(
  * Make a change to the xattr structure.
  *
  * The caller must have initialized @args, attached dquots, and must not hold
- * any ILOCKs.
+ * any ILOCKs.  Reserved data blocks may be used if @rsvd is set.
  *
  * Returns -EEXIST for XFS_ATTRUPDATE_CREATE if the name already exists.
  * Returns -ENOATTR for XFS_ATTRUPDATE_REMOVE if the name does not exist.
@@ -960,12 +960,12 @@ xfs_attr_lookup(
 int
 xfs_attr_set(
        struct xfs_da_args      *args,
-       enum xfs_attr_update    op)
+       enum xfs_attr_update    op,
+       bool                    rsvd)
 {
        struct xfs_inode        *dp = args->dp;
        struct xfs_mount        *mp = dp->i_mount;
        struct xfs_trans_res    tres;
-       bool                    rsvd = (args->attr_filter & XFS_ATTR_ROOT);
        int                     error, local;
        int                     rmt_blks = 0;
        unsigned int            total;

diff --git a/libxfs/xfs_attr.h b/libxfs/xfs_attr.h
index d12583dd7eecbea312b4bf9ed57385469a628b12..43dee4cbaab2515cb5207b53651fcdee00bcad41 100644 (file)
--- a/libxfs/xfs_attr.h
+++ b/libxfs/xfs_attr.h
@@ -558,7 +558,7 @@ enum xfs_attr_update {
        XFS_ATTRUPDATE_REPLACE, /* set value, fail if attr does not exist */
 };
 
-int xfs_attr_set(struct xfs_da_args *args, enum xfs_attr_update op);
+int xfs_attr_set(struct xfs_da_args *args, enum xfs_attr_update op, bool rsvd);
 int xfs_attr_set_iter(struct xfs_attr_intent *attr);
 int xfs_attr_remove_iter(struct xfs_attr_intent *attr);
 bool xfs_attr_check_namespace(unsigned int attr_flags);