diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-14 19:05:34 +0530 |
|---|---|---|
| committer | Varun Wadekar <vwadekar@nvidia.com> | 2012-05-14 19:05:34 +0530 |
| commit | 7afd70f67dbe38a71f118314108238b05f04de1f (patch) | |
| tree | 5df844a719437a15bebcfb7d5f76a08a4332a0ee /fs/namei.c | |
| parent | 93f3456666626d22c57a934d3651e4810b965a99 (diff) | |
vfs: make word-at-a-time accesses handle a non-existing page
It turns out that there are more cases than CONFIG_DEBUG_PAGEALLOC that
can have holes in the kernel address space: it seems to happen easily
with Xen, and it looks like the AMD gart64 code will also punch holes
dynamically.
Actually hitting that case is still very unlikely, so just do the
access, and take an exception and fix it up for the very unlikely case
of it being a page-crosser with no next page.
And hey, this abstraction might even help other architectures that have
other issues with unaligned word accesses than the possible missing next
page. IOW, this could do the byte order magic too.
Peter Anvin fixed a thinko in the shifting for the exception case.
Reported-and-tested-by: Jana Saout <jana@saout.de>
Cc: Peter Anvin <hpa@zytor.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Conflicts:
arch/x86/include/asm/word-at-a-time.h
Change-Id: I0d8358046b811ae66ae65e612edc778f781931f3
Diffstat (limited to 'fs/namei.c')
| -rw-r--r-- | fs/namei.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/namei.c b/fs/namei.c index 1898198abc3d..be8a0a42e493 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -1447,7 +1447,7 @@ unsigned int full_name_hash(const unsigned char *name, unsigned int len) unsigned long hash = 0; for (;;) { - a = *(unsigned long *)name; + a = load_unaligned_zeropad(name); if (len < sizeof(unsigned long)) break; hash += a; @@ -1488,7 +1488,7 @@ static inline unsigned long hash_name(const char *name, unsigned int *hashp) do { hash = (hash + a) * 9; len += sizeof(unsigned long); - a = *(unsigned long *)(name+len); + a = load_unaligned_zeropad(name+len); /* Do we have any NUL or '/' bytes in this word? */ mask = has_zero(a) | has_zero(a ^ SLASHBYTES); } while (!mask); |