Signed-off-by: Andrew Prout <ajprout@hotmail.com>
--- lustre-1.8.9/lustre/llite/dcache.c	2014-02-25 12:17:25.639681297 -0500
+++ lustre-1.8.9/lustre/llite/dcache.c	2014-02-25 12:25:35.964682867 -0500
@@ -486,7 +486,7 @@
                 first = ll_statahead_enter(parent, &de, 0);
 
 do_lock:
-        it->it_create_mode &= ~current->fs->umask;
+        it->it_create_mode &= ~current_umask();
         it->it_create_mode |= M_CHECK_STALE;
         rc = mdc_intent_lock(exp, &op_data, NULL, 0, it, lookup_flags,
                              &req, ll_mdc_blocking_ast, 0);
--- lustre-1.8.9/lustre/llite/namei.c	2014-02-25 12:17:25.646681652 -0500
+++ lustre-1.8.9/lustre/llite/namei.c	2014-02-25 12:26:32.153691414 -0500
@@ -618,7 +618,7 @@
         if (rc)
                 RETURN(ERR_PTR(rc));
 
-        it->it_create_mode &= ~current->fs->umask;
+        it->it_create_mode &= ~current_umask();
 
         rc = mdc_intent_lock(ll_i2mdcexp(parent), &op_data, NULL, 0, it,
                              lookup_flags, &req, ll_mdc_blocking_ast, 0);
@@ -949,7 +949,7 @@
                name->len, name->name, dir->i_ino, dir->i_generation, dir,
                mode, rdev);
 
-        mode &= ~current->fs->umask;
+        mode &= ~current_umask();
 
         switch (mode & S_IFMT) {
         case 0:
@@ -1073,7 +1073,7 @@
         CDEBUG(D_VFSTRACE, "VFS Op:name=%.*s,dir=%lu/%u(%p)\n",
                name->len, name->name, dir->i_ino, dir->i_generation, dir);
 
-        mode = (mode & (S_IRWXUGO|S_ISVTX) & ~current->fs->umask) | S_IFDIR;
+        mode = (mode & (S_IRWXUGO|S_ISVTX) & ~current_umask()) | S_IFDIR;
         err = ll_new_node(dir, name, NULL, mode, 0, dchild);
 
         RETURN(err);