From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: sandeen@sandeen.net, darrick.wong@oracle.com
Cc: linux-xfs@vger.kernel.org
Subject: [PATCH 16/18] libxfs: hide libxfs_getbuf_flags
Date: Wed, 19 Feb 2020 17:44:15 -0800 [thread overview]
Message-ID: <158216305519.602314.7497657265091013884.stgit@magnolia> (raw)
In-Reply-To: <158216295405.602314.2094526611933874427.stgit@magnolia>
From: Darrick J. Wong <darrick.wong@oracle.com>
Hide this function since it's internal to rdwr.c.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
libxfs/libxfs_io.h | 7 -------
libxfs/rdwr.c | 21 ++++++---------------
2 files changed, 6 insertions(+), 22 deletions(-)
diff --git a/libxfs/libxfs_io.h b/libxfs/libxfs_io.h
index 7d96c2a3..32f8fde7 100644
--- a/libxfs/libxfs_io.h
+++ b/libxfs/libxfs_io.h
@@ -147,9 +147,6 @@ extern struct cache_operations libxfs_bcache_operations;
#define libxfs_getbuf_map(dev, map, nmaps, flags) \
libxfs_trace_getbuf_map(__FUNCTION__, __FILE__, __LINE__, \
(dev), (map), (nmaps), (flags))
-#define libxfs_getbuf_flags(dev, daddr, len, flags) \
- libxfs_trace_getbuf_flags(__FUNCTION__, __FILE__, __LINE__, \
- (dev), (daddr), (len), (flags))
#define libxfs_buf_relse(buf) \
libxfs_trace_putbuf(__FUNCTION__, __FILE__, __LINE__, (buf))
@@ -166,8 +163,6 @@ struct xfs_buf *libxfs_trace_getbuf(const char *func, const char *file,
size_t len);
extern xfs_buf_t *libxfs_trace_getbuf_map(const char *, const char *, int,
struct xfs_buftarg *, struct xfs_buf_map *, int, int);
-extern xfs_buf_t *libxfs_trace_getbuf_flags(const char *, const char *, int,
- struct xfs_buftarg *, xfs_daddr_t, int, unsigned int);
extern void libxfs_trace_putbuf (const char *, const char *, int,
xfs_buf_t *);
@@ -178,8 +173,6 @@ extern xfs_buf_t *libxfs_readbuf_map(struct xfs_buftarg *, struct xfs_buf_map *,
void libxfs_buf_dirty(struct xfs_buf *bp, int flags);
extern xfs_buf_t *libxfs_getbuf_map(struct xfs_buftarg *,
struct xfs_buf_map *, int, int);
-extern xfs_buf_t *libxfs_getbuf_flags(struct xfs_buftarg *, xfs_daddr_t,
- int, unsigned int);
void libxfs_buf_relse(struct xfs_buf *);
static inline struct xfs_buf*
diff --git a/libxfs/rdwr.c b/libxfs/rdwr.c
index bab70dfd..f46787a6 100644
--- a/libxfs/rdwr.c
+++ b/libxfs/rdwr.c
@@ -388,7 +388,6 @@ libxfs_log_header(
#undef libxfs_readbuf_map
#undef libxfs_writebuf
#undef libxfs_getbuf_map
-#undef libxfs_getbuf_flags
xfs_buf_t *libxfs_readbuf_map(struct xfs_buftarg *, struct xfs_buf_map *,
int, int, const struct xfs_buf_ops *);
@@ -397,8 +396,6 @@ struct xfs_buf *libxfs_buf_get(struct xfs_buftarg *btp, xfs_daddr_t daddr,
size_t len);
xfs_buf_t *libxfs_getbuf_map(struct xfs_buftarg *, struct xfs_buf_map *,
int, int);
-xfs_buf_t *libxfs_getbuf_flags(struct xfs_buftarg *, xfs_daddr_t, int,
- unsigned int);
void libxfs_buf_relse(struct xfs_buf *);
#define __add_trace(bp, func, file, line) \
@@ -468,15 +465,6 @@ libxfs_trace_getbuf_map(const char *func, const char *file, int line,
return bp;
}
-xfs_buf_t *
-libxfs_trace_getbuf_flags(const char *func, const char *file, int line,
- struct xfs_buftarg *btp, xfs_daddr_t blkno, int len, unsigned int flags)
-{
- xfs_buf_t *bp = libxfs_getbuf_flags(btp, blkno, len, flags);
- __add_trace(bp, func, file, line);
- return bp;
-}
-
void
libxfs_trace_putbuf(const char *func, const char *file, int line, xfs_buf_t *bp)
{
@@ -780,9 +768,12 @@ __cache_lookup(struct xfs_bufkey *key, unsigned int flags)
return NULL;
}
-struct xfs_buf *
-libxfs_getbuf_flags(struct xfs_buftarg *btp, xfs_daddr_t blkno, int len,
- unsigned int flags)
+static struct xfs_buf *
+libxfs_getbuf_flags(
+ struct xfs_buftarg *btp,
+ xfs_daddr_t blkno,
+ int len,
+ unsigned int flags)
{
struct xfs_bufkey key = {NULL};
next prev parent reply other threads:[~2020-02-20 1:44 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-20 1:42 [PATCH 00/18] xfsprogs: refactor buffer function names Darrick J. Wong
2020-02-20 1:42 ` [PATCH 01/18] libxfs: clean up readbuf flags Darrick J. Wong
2020-02-21 14:42 ` Christoph Hellwig
2020-02-21 15:55 ` Darrick J. Wong
2020-02-20 1:42 ` [PATCH 02/18] libxfs: clean up writebuf flags Darrick J. Wong
2020-02-20 1:42 ` [PATCH 03/18] libxfs: remove LIBXFS_EXIT_ON_FAILURE Darrick J. Wong
2020-02-20 1:43 ` [PATCH 04/18] libxfs: replace libxfs_putbuf with libxfs_buf_relse Darrick J. Wong
2020-02-21 14:43 ` Christoph Hellwig
2020-02-21 15:01 ` Eric Sandeen
2020-02-20 1:43 ` [PATCH 05/18] libxfs: replace libxfs_getbuf with libxfs_buf_get Darrick J. Wong
2020-02-21 14:43 ` Christoph Hellwig
2020-02-20 1:43 ` [PATCH 06/18] libxfs: replace libxfs_readbuf with libxfs_buf_read Darrick J. Wong
2020-02-21 14:44 ` Christoph Hellwig
2020-02-20 1:43 ` [PATCH 07/18] libxfs: make libxfs_bwrite do what libxfs_writebufr does Darrick J. Wong
2020-02-21 14:45 ` Christoph Hellwig
2020-02-21 20:43 ` Darrick J. Wong
2020-02-20 1:43 ` [PATCH 08/18] libxfs: make libxfs_readbuf_verify return an error code Darrick J. Wong
2020-02-21 14:46 ` Christoph Hellwig
2020-02-20 1:43 ` [PATCH 09/18] libxfs: make libxfs_readbufr stash the error value in b_error Darrick J. Wong
2020-02-21 14:46 ` Christoph Hellwig
2020-02-20 1:43 ` [PATCH 10/18] libxfs: introduce libxfs_buf_read_uncached Darrick J. Wong
2020-02-21 14:48 ` Christoph Hellwig
2020-02-21 20:50 ` Darrick J. Wong
2020-02-21 20:59 ` Darrick J. Wong
2020-02-20 1:43 ` [PATCH 11/18] libxlog: use uncached buffers instead of open-coding them Darrick J. Wong
2020-02-21 14:49 ` Christoph Hellwig
2020-02-21 15:51 ` Darrick J. Wong
2020-02-20 1:43 ` [PATCH 12/18] libxfs: use uncached buffers for initial mkfs writes Darrick J. Wong
2020-02-21 14:51 ` Christoph Hellwig
2020-02-21 15:52 ` Darrick J. Wong
2020-02-20 1:43 ` [PATCH 13/18] libxfs: straighten out libxfs_writebuf confusion Darrick J. Wong
2020-02-21 14:53 ` Christoph Hellwig
2020-02-21 15:54 ` Darrick J. Wong
2020-02-20 1:44 ` [PATCH 14/18] libxfs: remove libxfs_writebuf_int Darrick J. Wong
2020-02-21 14:53 ` Christoph Hellwig
2020-02-20 1:44 ` [PATCH 15/18] libxfs: hide libxfs_{get,put}bufr Darrick J. Wong
2020-02-21 14:53 ` Christoph Hellwig
2020-02-21 16:00 ` Darrick J. Wong
2020-02-20 1:44 ` Darrick J. Wong [this message]
2020-02-21 14:54 ` [PATCH 16/18] libxfs: hide libxfs_getbuf_flags Christoph Hellwig
2020-02-20 1:44 ` [PATCH 17/18] libxfs: rename libxfs_readbuf_map to libxfs_buf_read_map Darrick J. Wong
2020-02-21 14:54 ` Christoph Hellwig
2020-02-20 1:44 ` [PATCH 18/18] libxfs: rename libxfs_getbuf_map to libxfs_buf_get_map Darrick J. Wong
2020-02-21 14:55 ` Christoph Hellwig
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=158216305519.602314.7497657265091013884.stgit@magnolia \
--to=darrick.wong@oracle.com \
--cc=linux-xfs@vger.kernel.org \
--cc=sandeen@sandeen.net \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.