Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

6 files changed, 9 insertions, 9 deletions

diff --git a/fs/ntfs/attrib.c b/fs/ntfs/attrib.c
index 9f08e851cfb6..c577d8e1bd95 100644
--- 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;
diff --git a/fs/ntfs/dir.c b/fs/ntfs/dir.c
index 85c36b8ca452..8296c29ae3b8 100644
--- a/fs/ntfs/dir.c
+++ b/fs/ntfs/dir.c
@@ -1101,7 +1101,7 @@ static int ntfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
 {
         s64 ia_pos, ia_start, prev_ia_pos, bmp_pos;
         loff_t fpos, i_size;
-        struct inode *bmp_vi, *vdir = filp->f_dentry->d_inode;
+        struct inode *bmp_vi, *vdir = filp->f_path.dentry->d_inode;
         struct super_block *sb = vdir->i_sb;
         ntfs_inode *ndir = NTFS_I(vdir);
         ntfs_volume *vol = NTFS_SB(sb);
@@ -1136,9 +1136,9 @@ static int ntfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
         if (fpos == 1) {
                 ntfs_debug("Calling filldir for .. with len 2, fpos 0x1, "
                                 "inode 0x%lx, DT_DIR.",
-                                (unsigned long)parent_ino(filp->f_dentry));
+                                (unsigned long)parent_ino(filp->f_path.dentry));
                 rc = filldir(dirent, "..", 2, fpos,
-                                parent_ino(filp->f_dentry), DT_DIR);
+                                parent_ino(filp->f_path.dentry), DT_DIR);
                 if (rc)
                         goto done;
                 fpos++;
diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c
index ae2fe0016d2c..076c9420c257 100644
--- a/fs/ntfs/file.c
+++ b/fs/ntfs/file.c
@@ -2162,7 +2162,7 @@ static ssize_t ntfs_file_aio_write_nolock(struct kiocb *iocb,
                 goto out;
         if (!count)
                 goto out;
-        err = remove_suid(file->f_dentry);
+        err = remove_suid(file->f_path.dentry);
         if (err)
                 goto out;
         file_update_time(file);
diff --git a/fs/ntfs/index.c b/fs/ntfs/index.c
index e32cde486362..2194eff49743 100644
--- a/fs/ntfs/index.c
+++ b/fs/ntfs/index.c
@@ -38,7 +38,7 @@ ntfs_index_context *ntfs_index_ctx_get(ntfs_inode *idx_ni)
 {
         ntfs_index_context *ictx;
 
-        ictx = kmem_cache_alloc(ntfs_index_ctx_cache, SLAB_NOFS);
+        ictx = kmem_cache_alloc(ntfs_index_ctx_cache, GFP_NOFS);
         if (ictx)
                 *ictx = (ntfs_index_context){ .idx_ni = idx_ni };
         return ictx;
diff --git a/fs/ntfs/inode.c b/fs/ntfs/inode.c
index 2d3de9c89818..247989891b4b 100644
--- a/fs/ntfs/inode.c
+++ b/fs/ntfs/inode.c
@@ -324,7 +324,7 @@ struct inode *ntfs_alloc_big_inode(struct super_block *sb)
         ntfs_inode *ni;
 
         ntfs_debug("Entering.");
-        ni = kmem_cache_alloc(ntfs_big_inode_cache, SLAB_NOFS);
+        ni = kmem_cache_alloc(ntfs_big_inode_cache, GFP_NOFS);
         if (likely(ni != NULL)) {
                 ni->state = 0;
                 return VFS_I(ni);
@@ -349,7 +349,7 @@ static inline ntfs_inode *ntfs_alloc_extent_inode(void)
         ntfs_inode *ni;
 
         ntfs_debug("Entering.");
-        ni = kmem_cache_alloc(ntfs_inode_cache, SLAB_NOFS);
+        ni = kmem_cache_alloc(ntfs_inode_cache, GFP_NOFS);
         if (likely(ni != NULL)) {
                 ni->state = 0;
                 return ni;
diff --git a/fs/ntfs/unistr.c b/fs/ntfs/unistr.c
index 6a495f7369f9..005ca4b0f132 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,