git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
staging: slicoss: remove gratuitous debug infrastructure
[pandora-kernel.git]
/
fs
/
ntfs
/
unistr.c
diff --git
a/fs/ntfs/unistr.c
b/fs/ntfs/unistr.c
index
6a495f7
..
005ca4b
100644
(file)
--- a/
fs/ntfs/unistr.c
+++ b/
fs/ntfs/unistr.c
@@
-266,7
+266,7
@@
int ntfs_nlstoucs(const ntfs_volume *vol, const char *ins,
/* We do not trust outside sources. */
if (likely(ins)) {
/* We do not trust outside sources. */
if (likely(ins)) {
- ucs = kmem_cache_alloc(ntfs_name_cache,
SLAB
_NOFS);
+ ucs = kmem_cache_alloc(ntfs_name_cache,
GFP
_NOFS);
if (likely(ucs)) {
for (i = o = 0; i < ins_len; i += wc_len) {
wc_len = nls->char2uni(ins + i, ins_len - i,
if (likely(ucs)) {
for (i = o = 0; i < ins_len; i += wc_len) {
wc_len = nls->char2uni(ins + i, ins_len - i,