From: Chandan Rajendra <chandanrlinux@gmail.com>
To: linux-xfs@vger.kernel.org
Cc: Chandan Rajendra <chandanrlinux@gmail.com>,
david@fromorbit.com, chandan@linux.ibm.com,
darrick.wong@oracle.com, bfoster@redhat.com, amir73il@gmail.com
Subject: [PATCH V4 RESEND 6/7] xfsprogs: Make xfs_attr_calc_size() non-static
Date: Mon, 24 Feb 2020 09:31:35 +0530 [thread overview]
Message-ID: <20200224040136.31078-7-chandanrlinux@gmail.com> (raw)
In-Reply-To: <20200224040136.31078-1-chandanrlinux@gmail.com>
A future commit will cause xfs_attr_calc_size() to be invoked from a function
defined in another file. Hence this commit makes xfs_attr_calc_size() as
non-static.
Signed-off-by: Chandan Rajendra <chandanrlinux@gmail.com>
---
libxfs/xfs_attr.c | 58 +++++++++++++++++++++++------------------------
libxfs/xfs_attr.h | 2 ++
2 files changed, 31 insertions(+), 29 deletions(-)
diff --git a/libxfs/xfs_attr.c b/libxfs/xfs_attr.c
index 78127dfc..343ae79f 100644
--- a/libxfs/xfs_attr.c
+++ b/libxfs/xfs_attr.c
@@ -133,10 +133,38 @@ xfs_attr_get(
return error;
}
+STATIC int
+xfs_attr_try_sf_addname(
+ struct xfs_inode *dp,
+ struct xfs_da_args *args)
+{
+
+ struct xfs_mount *mp = dp->i_mount;
+ int error, error2;
+
+ error = xfs_attr_shortform_addname(args);
+ if (error == -ENOSPC)
+ return error;
+
+ /*
+ * Commit the shortform mods, and we're done.
+ * NOTE: this is also the error path (EEXIST, etc).
+ */
+ if (!error && !(args->op_flags & XFS_DA_OP_NOTIME))
+ xfs_trans_ichgtime(args->trans, dp, XFS_ICHGTIME_CHG);
+
+ if (mp->m_flags & XFS_MOUNT_WSYNC)
+ xfs_trans_set_sync(args->trans);
+
+ error2 = xfs_trans_commit(args->trans);
+ args->trans = NULL;
+ return error ? error : error2;
+}
+
/*
* Calculate how many blocks we need for the new attribute,
*/
-STATIC void
+void
xfs_attr_calc_size(
struct xfs_mount *mp,
struct xfs_attr_set_resv *resv,
@@ -176,34 +204,6 @@ xfs_attr_calc_size(
resv->bmbt_blks;
}
-STATIC int
-xfs_attr_try_sf_addname(
- struct xfs_inode *dp,
- struct xfs_da_args *args)
-{
-
- struct xfs_mount *mp = dp->i_mount;
- int error, error2;
-
- error = xfs_attr_shortform_addname(args);
- if (error == -ENOSPC)
- return error;
-
- /*
- * Commit the shortform mods, and we're done.
- * NOTE: this is also the error path (EEXIST, etc).
- */
- if (!error && !(args->op_flags & XFS_DA_OP_NOTIME))
- xfs_trans_ichgtime(args->trans, dp, XFS_ICHGTIME_CHG);
-
- if (mp->m_flags & XFS_MOUNT_WSYNC)
- xfs_trans_set_sync(args->trans);
-
- error2 = xfs_trans_commit(args->trans);
- args->trans = NULL;
- return error ? error : error2;
-}
-
/*
* Set the attribute specified in @args.
*/
diff --git a/libxfs/xfs_attr.h b/libxfs/xfs_attr.h
index dc08bdfb..0e387230 100644
--- a/libxfs/xfs_attr.h
+++ b/libxfs/xfs_attr.h
@@ -104,5 +104,7 @@ int xfs_attr_set(struct xfs_da_args *args);
int xfs_attr_set_args(struct xfs_da_args *args);
int xfs_attr_remove_args(struct xfs_da_args *args);
bool xfs_attr_namecheck(const void *name, size_t length);
+void xfs_attr_calc_size(struct xfs_mount *mp, struct xfs_attr_set_resv *resv,
+ int namelen, int valuelen, int *local);
#endif /* __XFS_ATTR_H__ */
--
2.19.1
next prev parent reply other threads:[~2020-02-24 3:59 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-24 4:01 [PATCH V4 RESEND 0/7] xfsprogs: Fix log reservation calculation for xattr insert operation Chandan Rajendra
2020-02-24 4:01 ` [PATCH V4 RESEND 1/7] xfsprogs: Pass xattr name and value length explicitly to xfs_attr_leaf_newentsize Chandan Rajendra
2020-02-24 4:01 ` [PATCH V4 RESEND 2/7] xfsprogs: xfs_attr_calc_size: Use local variables to track individual space components Chandan Rajendra
2020-02-24 4:01 ` [PATCH V4 RESEND 3/7] xfsprogs: xfs_attr_calc_size: Calculate Bmbt blks only once Chandan Rajendra
2020-02-24 4:01 ` [PATCH V4 RESEND 4/7] xfsprogs: Introduce struct xfs_attr_set_resv Chandan Rajendra
2020-02-24 4:01 ` [PATCH V4 RESEND 5/7] xfsprogs: xfs_attr_calc_size: Explicitly pass mp, namelen and valuelen args Chandan Rajendra
2020-02-24 4:01 ` Chandan Rajendra [this message]
2020-02-24 4:01 ` [PATCH V4 RESEND 7/7] xfsprogs: Fix log reservation calculation for xattr insert operation Chandan Rajendra
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200224040136.31078-7-chandanrlinux@gmail.com \
--to=chandanrlinux@gmail.com \
--cc=amir73il@gmail.com \
--cc=bfoster@redhat.com \
--cc=chandan@linux.ibm.com \
--cc=darrick.wong@oracle.com \
--cc=david@fromorbit.com \
--cc=linux-xfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox