From: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>,
linux-kernel@vger.kernel.org
Subject: [GIT PULL] UBIFS changes for 2.6.31
Date: Wed, 17 Jun 2009 16:53:48 +0300 [thread overview]
Message-ID: <20090617135348.2686.45475.sendpatchset@localhost.localdomain> (raw)
Hi Linus,
please pull UBIFS changes from
git://git.infradead.org/ubifs-2.6.git linux-next
The following changes since commit 091438dd5668396328a3419abcbc6591159eb8d1:
Linus Torvalds (1):
Linux 2.6.30-rc4
are available:
Adrian Hunter (1):
UBIFS: reset no_space flag after inode deletion
Artem Bityutskiy (6):
UBIFS: use anonymous device
UBIFS: remove dead code
UBIFS: allow sync option in rootflags
UBIFS: do not forget to register BDI device
hrtimer: export ktime_add_safe
UBIFS: start using hrtimers
Corentin Chary (1):
UBIFS: return proper error code if the compr is not present
Hunter Adrian (1):
UBIFS: return error if link and unlink race
fs/ubifs/budget.c | 4 +-
fs/ubifs/dir.c | 19 +++++++++++++
fs/ubifs/io.c | 34 ++++++++++++++---------
fs/ubifs/recovery.c | 31 +++------------------
fs/ubifs/super.c | 76 ++++++++++++++++++++++++++++++++++-----------------
fs/ubifs/ubifs.h | 13 +++++---
kernel/hrtimer.c | 2 +
7 files changed, 107 insertions(+), 72 deletions(-)
There is one trivial hrtimer patch:
commit 8daa21e61be47a5b136c4ee1be82e391a5788696
Author: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Date: Thu May 28 16:21:24 2009 +0300
hrtimer: export ktime_add_safe
We want to use hrtimers in UBIFS (for write-buffer write-back timer).
We need the 'hrtimer_set_expires_range_ns()', which is an in-line
function which uses 'ktime_add_safe()'.
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Acked-by: Ingo Molnar <mingo@elte.hu>
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
index cb8a15c..18f6906 100644
--- a/kernel/hrtimer.c
+++ b/kernel/hrtimer.c
@@ -332,6 +332,8 @@ ktime_t ktime_add_safe(const ktime_t lhs, const ktime_t rhs)
return res;
}
+EXPORT_SYMBOL_GPL(ktime_add_safe);
+
#ifdef CONFIG_DEBUG_OBJECTS_TIMERS
static struct debug_obj_descr hrtimer_debug_descr;
I have green light from Ingo for merging this patch via ubifs tree:
http://lkml.org/lkml/2009/6/1/331
Thanks,
Artem.
reply other threads:[~2009-06-17 12:01 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20090617135348.2686.45475.sendpatchset@localhost.localdomain \
--to=artem.bityutskiy@nokia.com \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@linux-foundation.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 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.