From a0c7416698ee052f50c1bef50193e47bc80930d9 Mon Sep 17 00:00:00 2001 From: yangsheng Date: Tue, 14 Dec 2010 02:56:38 +0800 Subject: [PATCH] b=24037 Using cfs_curproc_umask() instead of reference directly. i=vitaly --- lustre/llite/dcache.c | 2 +- lustre/llite/namei.c | 6 +++--- lustre/lvfs/lvfs_linux.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lustre/llite/dcache.c b/lustre/llite/dcache.c index 4f359b0..b4758e0 100644 --- a/lustre/llite/dcache.c +++ b/lustre/llite/dcache.c @@ -514,7 +514,7 @@ int ll_revalidate_it(struct dentry *de, int lookup_flags, first = ll_statahead_enter(parent, &de, 0); do_lock: - it->it_create_mode &= ~current->fs->umask; + it->it_create_mode &= ~cfs_curproc_umask(); it->it_create_mode |= M_CHECK_STALE; rc = md_intent_lock(exp, op_data, NULL, 0, it, lookup_flags, diff --git a/lustre/llite/namei.c b/lustre/llite/namei.c index 19ba2a7..b993c0b 100644 --- a/lustre/llite/namei.c +++ b/lustre/llite/namei.c @@ -562,7 +562,7 @@ static struct dentry *ll_lookup_it(struct inode *parent, struct dentry *dentry, if (IS_ERR(op_data)) RETURN((void *)op_data); - it->it_create_mode &= ~current->fs->umask; + it->it_create_mode &= ~cfs_curproc_umask(); rc = md_intent_lock(ll_i2mdexp(parent), op_data, NULL, 0, it, lookup_flags, &req, ll_md_blocking_ast, 0); @@ -887,7 +887,7 @@ static int ll_mknod_generic(struct inode *dir, struct qstr *name, int mode, name->len, name->name, dir->i_ino, dir->i_generation, dir, mode, rdev); - mode &= ~current->fs->umask; + mode &= ~cfs_curproc_umask(); switch (mode & S_IFMT) { case 0: @@ -1013,7 +1013,7 @@ static int ll_mkdir_generic(struct inode *dir, struct qstr *name, 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) & ~cfs_curproc_umask()) | S_IFDIR; err = ll_new_node(dir, name, NULL, mode, 0, dchild, LUSTRE_OPC_MKDIR); RETURN(err); diff --git a/lustre/lvfs/lvfs_linux.c b/lustre/lvfs/lvfs_linux.c index fcb873b..4269afe 100644 --- a/lustre/lvfs/lvfs_linux.c +++ b/lustre/lvfs/lvfs_linux.c @@ -129,7 +129,7 @@ void push_ctxt(struct lvfs_run_ctxt *save, struct lvfs_run_ctxt *new_ctx, LASSERT(cfs_atomic_read(&new_ctx->pwd->d_count)); save->pwd = dget(cfs_fs_pwd(current->fs)); save->pwdmnt = mntget(cfs_fs_mnt(current->fs)); - save->luc.luc_umask = current->fs->umask; + save->luc.luc_umask = cfs_curproc_umask(); save->ngroups = current_cred()->group_info->ngroups; LASSERT(save->pwd); -- 1.8.3.1