From f9ef6119662089e7b3b0c9dd768a57c1fa141629 Mon Sep 17 00:00:00 2001 From: Tim Bird Date: Thu, 10 May 2012 14:22:59 -0700 Subject: [PATCH] --- yaml --- r: 304639 b: refs/heads/master c: e7f3eb0c912ca334fa67429a060389cbea6e815d h: refs/heads/master i: 304637: 1767ebabaea6bf863e6f7be20c8c54fd5c3505b2 304635: a283fddb5154d90158b384164fbcc6e35694bd40 304631: bd5c53c9808777c33c203727fc2d3af24b2228bf 304623: 6a58a688c7b5b7e22cc9d11111d2a8041a7f185f 304607: 2ebfd631f0054b5e81b26ee391c48c4279f6befe 304575: ee1011538f68bb12790c1a2e1554b3403c7b0e06 304511: c4cdcae4ded15118a3126f5ed91c26693e139780 304383: 2ae11248698ca087cdf412c146315f528229a829 304127: 50942c5596af96b4a64e1f523832cf4dddc2cdd8 v: v3 --- [refs] | 2 +- trunk/drivers/staging/android/logger.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 5c7246ceaabc..ef16586e32e3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 10b241991fc10876b46ab7ca690f44281510d85b +refs/heads/master: e7f3eb0c912ca334fa67429a060389cbea6e815d diff --git a/trunk/drivers/staging/android/logger.c b/trunk/drivers/staging/android/logger.c index ed7e55247374..b2e71c6fd175 100644 --- a/trunk/drivers/staging/android/logger.c +++ b/trunk/drivers/staging/android/logger.c @@ -65,9 +65,9 @@ struct logger_reader { }; /* logger_offset - returns index 'n' into the log via (optimized) modulus */ -size_t logger_offset(struct logger_log *log, size_t n) +static size_t logger_offset(struct logger_log *log, size_t n) { - return n & (log->size-1); + return n & (log->size - 1); } @@ -353,7 +353,7 @@ static ssize_t do_write_log_from_user(struct logger_log *log, * writev(), and aio_write(). Writes are our fast path, and we try to optimize * them above all else. */ -ssize_t logger_aio_write(struct kiocb *iocb, const struct iovec *iov, +static ssize_t logger_aio_write(struct kiocb *iocb, const struct iovec *iov, unsigned long nr_segs, loff_t ppos) { struct logger_log *log = file_get_log(iocb->ki_filp);