Skip to content

Commit

Permalink
errseq: rename __errseq_set to errseq_set
Browse files Browse the repository at this point in the history
Nothing calls this wrapper anymore, so just remove it and rename the
old function to get rid of the double underscore prefix.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
  • Loading branch information
Jeff Layton committed Jul 26, 2017
1 parent 5771a8c commit 3acdfd2
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 19 deletions.
9 changes: 1 addition & 8 deletions include/linux/errseq.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,7 @@

typedef u32 errseq_t;

errseq_t __errseq_set(errseq_t *eseq, int err);
static inline void errseq_set(errseq_t *eseq, int err)
{
/* Optimize for the common case of no error */
if (unlikely(err))
__errseq_set(eseq, err);
}

errseq_t errseq_set(errseq_t *eseq, int err);
errseq_t errseq_sample(errseq_t *eseq);
int errseq_check(errseq_t *eseq, errseq_t since);
int errseq_check_and_advance(errseq_t *eseq, errseq_t *since);
Expand Down
17 changes: 7 additions & 10 deletions lib/errseq.c
Original file line number Diff line number Diff line change
Expand Up @@ -41,23 +41,20 @@
#define ERRSEQ_CTR_INC (1 << (ERRSEQ_SHIFT + 1))

/**
* __errseq_set - set a errseq_t for later reporting
* errseq_set - set a errseq_t for later reporting
* @eseq: errseq_t field that should be set
* @err: error to set
* @err: error to set (must be between -1 and -MAX_ERRNO)
*
* This function sets the error in *eseq, and increments the sequence counter
* if the last sequence was sampled at some point in the past.
*
* Any error set will always overwrite an existing error.
*
* Most callers will want to use the errseq_set inline wrapper to efficiently
* handle the common case where err is 0.
*
* We do return an errseq_t here, primarily for debugging purposes. The return
* value should not be used as a previously sampled value in later calls as it
* will not have the SEEN flag set.
* We do return the latest value here, primarily for debugging purposes. The
* return value should not be used as a previously sampled value in later calls
* as it will not have the SEEN flag set.
*/
errseq_t __errseq_set(errseq_t *eseq, int err)
errseq_t errseq_set(errseq_t *eseq, int err)
{
errseq_t cur, old;

Expand Down Expand Up @@ -107,7 +104,7 @@ errseq_t __errseq_set(errseq_t *eseq, int err)
}
return cur;
}
EXPORT_SYMBOL(__errseq_set);
EXPORT_SYMBOL(errseq_set);

/**
* errseq_sample - grab current errseq_t value
Expand Down
2 changes: 1 addition & 1 deletion mm/filemap.c
Original file line number Diff line number Diff line change
Expand Up @@ -589,7 +589,7 @@ EXPORT_SYMBOL(filemap_write_and_wait_range);

void __filemap_set_wb_err(struct address_space *mapping, int err)
{
errseq_t eseq = __errseq_set(&mapping->wb_err, err);
errseq_t eseq = errseq_set(&mapping->wb_err, err);

trace_filemap_set_wb_err(mapping, eseq);
}
Expand Down

0 comments on commit 3acdfd2

Please sign in to comment.