Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6

[linux-2.6-omap-h63xx.git] / fs / ntfs / attrib.c

diff --git a/fs/ntfs/attrib.c b/fs/ntfs/attrib.c
index 9f08e851cfb69ed9373344b7865b42b747451d0f..7659cc1929953cb0045d9451b1614e76a52e9b03 100644 (file)
--- a/fs/ntfs/attrib.c
+++ b/fs/ntfs/attrib.c
@@ -1272,7 +1272,7 @@ ntfs_attr_search_ctx *ntfs_attr_get_search_ctx(ntfs_inode *ni, MFT_RECORD *mrec)
 {
        ntfs_attr_search_ctx *ctx;
 
-       ctx = kmem_cache_alloc(ntfs_attr_ctx_cache, SLAB_NOFS);
+       ctx = kmem_cache_alloc(ntfs_attr_ctx_cache, GFP_NOFS);
        if (ctx)
                ntfs_attr_init_search_ctx(ctx, ni, mrec);
        return ctx;
@@ -1921,7 +1921,7 @@ s64 ntfs_attr_extend_allocation(ntfs_inode *ni, s64 new_alloc_size,
        u32 attr_len = 0; /* Silence stupid gcc warning. */
        bool mp_rebuilt;
 
-#ifdef NTFS_DEBUG
+#ifdef DEBUG
        read_lock_irqsave(&ni->size_lock, flags);
        allocated_size = ni->allocated_size;
        read_unlock_irqrestore(&ni->size_lock, flags);