X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=fs%2Fntfs%2Funistr.c;h=005ca4b0f132fc1e4515a5f5b9e5e7d1acd26726;hb=4b48d9d44ebe0e8c31b4fe3b7480941576fff613;hp=6a495f7369f9e7fbd170d0802014f4d750d6c6ae;hpb=63c422afe3739b68bec0b5c42807d1450c951caf;p=linux-2.6-omap-h63xx.git

diff --git a/fs/ntfs/unistr.c b/fs/ntfs/unistr.c
index 6a495f7369f..005ca4b0f13 100644
--- 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)) {
-		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,