p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

errseq: rename __errseq_set to errseq_set 

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>
This commit is contained in:
Jeff Layton 2017-07-24 06:22:15 -04:00
parent 5771a8c088
commit 3acdfd280f
3 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/linux/errseq.h
View File

@ -5,14 +5,7 @@
typedef u32 errseq_t; typedef u32 errseq_t;
errseq_t __errseq_set(errseq_t *eseq, int err); 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_sample(errseq_t *eseq); errseq_t errseq_sample(errseq_t *eseq);
int errseq_check(errseq_t *eseq, errseq_t since); int errseq_check(errseq_t *eseq, errseq_t since);
int errseq_check_and_advance(errseq_t *eseq, errseq_t *since); int errseq_check_and_advance(errseq_t *eseq, errseq_t *since);

17
lib/errseq.c
View File

@ -41,23 +41,20 @@
#define ERRSEQ_CTR_INC (1 << (ERRSEQ_SHIFT + 1)) #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 * @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 * This function sets the error in *eseq, and increments the sequence counter
* if the last sequence was sampled at some point in the past. * if the last sequence was sampled at some point in the past.
* *
* Any error set will always overwrite an existing error. * Any error set will always overwrite an existing error.
* *
* Most callers will want to use the errseq_set inline wrapper to efficiently * We do return the latest value here, primarily for debugging purposes. The
* handle the common case where err is 0. * 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 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.
*/ */
errseq_t __errseq_set(errseq_t *eseq, int err) errseq_t errseq_set(errseq_t *eseq, int err)
{ {
errseq_t cur, old; errseq_t cur, old;
@ -107,7 +104,7 @@ errseq_t __errseq_set(errseq_t *eseq, int err)
} }
return cur; return cur;
} }
EXPORT_SYMBOL(__errseq_set); EXPORT_SYMBOL(errseq_set);
/** /**
* errseq_sample - grab current errseq_t value * errseq_sample - grab current errseq_t value

2
mm/filemap.c
View File

@ -589,7 +589,7 @@ EXPORT_SYMBOL(filemap_write_and_wait_range);
void __filemap_set_wb_err(struct address_space *mapping, int err) 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); trace_filemap_set_wb_err(mapping, eseq);
} }