X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Flvfs%2Flvfs_linux.c;h=af03ac743dd5bb3a345b6ce192de261a87ec7c20;hb=a5b81807c5d6d2cb3b2ef1a0a7e150ee6002f7f7;hp=5d07875c9be55a609cb7eb4c45791403017688fa;hpb=90d8e7fd28746a572c8de488222f5312fe927fc3;p=fs%2Flustre-release.git diff --git a/lustre/lvfs/lvfs_linux.c b/lustre/lvfs/lvfs_linux.c index 5d07875..af03ac7 100644 --- a/lustre/lvfs/lvfs_linux.c +++ b/lustre/lvfs/lvfs_linux.c @@ -26,7 +26,7 @@ * GPL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. */ /* @@ -67,7 +67,7 @@ __u64 obd_max_pages = 0; __u64 obd_max_alloc = 0; struct lprocfs_stats *obd_memory = NULL; -spinlock_t obd_updatemax_lock = SPIN_LOCK_UNLOCKED; +cfs_spinlock_t obd_updatemax_lock = CFS_SPIN_LOCK_UNLOCKED; /* refine later and change to seqlock or simlar from libcfs */ /* Debugging check only needed during development */ @@ -89,9 +89,13 @@ static void push_group_info(struct lvfs_run_ctxt *save, save->ngroups = current_ngroups; current_ngroups = 0; } else { + struct cred *cred; task_lock(current); - save->group_info = current->group_info; - current->group_info = ginfo; + save->group_info = current_cred()->group_info; + if ((cred = prepare_creds())) { + cred->group_info = ginfo; + commit_creds(cred); + } task_unlock(current); } } @@ -102,8 +106,12 @@ static void pop_group_info(struct lvfs_run_ctxt *save, if (!ginfo) { current_ngroups = save->ngroups; } else { + struct cred *cred; task_lock(current); - current->group_info = save->group_info; + if ((cred = prepare_creds())) { + cred->group_info = save->group_info; + commit_creds(cred); + } task_unlock(current); } } @@ -117,12 +125,12 @@ void push_ctxt(struct lvfs_run_ctxt *save, struct lvfs_run_ctxt *new_ctx, OBD_SET_CTXT_MAGIC(save); save->fs = get_fs(); - LASSERT(atomic_read(¤t->fs->pwd->d_count)); - LASSERT(atomic_read(&new_ctx->pwd->d_count)); - save->pwd = dget(current->fs->pwd); - save->pwdmnt = mntget(current->fs->pwdmnt); - save->luc.luc_umask = current->fs->umask; - save->ngroups = current->group_info->ngroups; + LASSERT(cfs_atomic_read(&cfs_fs_pwd(current->fs)->d_count)); + 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 = cfs_curproc_umask(); + save->ngroups = current_cred()->group_info->ngroups; LASSERT(save->pwd); LASSERT(save->pwdmnt); @@ -130,17 +138,21 @@ void push_ctxt(struct lvfs_run_ctxt *save, struct lvfs_run_ctxt *new_ctx, LASSERT(new_ctx->pwdmnt); if (uc) { - save->luc.luc_uid = current->uid; - save->luc.luc_gid = current->gid; - save->luc.luc_fsuid = current->fsuid; - save->luc.luc_fsgid = current->fsgid; - save->luc.luc_cap = current->cap_effective; - - current->uid = uc->luc_uid; - current->gid = uc->luc_gid; - current->fsuid = uc->luc_fsuid; - current->fsgid = uc->luc_fsgid; - current->cap_effective = uc->luc_cap; + struct cred *cred; + save->luc.luc_uid = current_uid(); + save->luc.luc_gid = current_gid(); + save->luc.luc_fsuid = current_fsuid(); + save->luc.luc_fsgid = current_fsgid(); + save->luc.luc_cap = current_cap(); + + if ((cred = prepare_creds())) { + cred->uid = uc->luc_uid; + cred->gid = uc->luc_gid; + cred->fsuid = uc->luc_fsuid; + cred->fsgid = uc->luc_fsgid; + cred->cap_effective = uc->luc_cap; + commit_creds(cred); + } push_group_info(save, uc->luc_ginfo ?: @@ -159,10 +171,10 @@ void pop_ctxt(struct lvfs_run_ctxt *saved, struct lvfs_run_ctxt *new_ctx, ASSERT_CTXT_MAGIC(saved->magic); ASSERT_KERNEL_CTXT("popping non-kernel context!\n"); - LASSERTF(current->fs->pwd == new_ctx->pwd, "%p != %p\n", - current->fs->pwd, new_ctx->pwd); - LASSERTF(current->fs->pwdmnt == new_ctx->pwdmnt, "%p != %p\n", - current->fs->pwdmnt, new_ctx->pwdmnt); + LASSERTF(cfs_fs_pwd(current->fs) == new_ctx->pwd, "%p != %p\n", + cfs_fs_pwd(current->fs), new_ctx->pwd); + LASSERTF(cfs_fs_mnt(current->fs) == new_ctx->pwdmnt, "%p != %p\n", + cfs_fs_mnt(current->fs), new_ctx->pwdmnt); set_fs(saved->fs); ll_set_fs_pwd(current->fs, saved->pwdmnt, saved->pwd); @@ -171,11 +183,16 @@ void pop_ctxt(struct lvfs_run_ctxt *saved, struct lvfs_run_ctxt *new_ctx, mntput(saved->pwdmnt); current->fs->umask = saved->luc.luc_umask; if (uc) { - current->uid = saved->luc.luc_uid; - current->gid = saved->luc.luc_gid; - current->fsuid = saved->luc.luc_fsuid; - current->fsgid = saved->luc.luc_fsgid; - current->cap_effective = saved->luc.luc_cap; + struct cred *cred; + if ((cred = prepare_creds())) { + cred->uid = saved->luc.luc_uid; + cred->gid = saved->luc.luc_gid; + cred->fsuid = saved->luc.luc_fsuid; + cred->fsgid = saved->luc.luc_fsgid; + cred->cap_effective = saved->luc.luc_cap; + commit_creds(cred); + } + pop_group_info(saved, uc->luc_ginfo ?: uc->luc_identity ? uc->luc_identity->mi_ginfo : @@ -362,21 +379,17 @@ int lustre_fsync(struct file *file) } EXPORT_SYMBOL(lustre_fsync); +/* Note: dput(dchild) will be called if there is an error */ struct l_file *l_dentry_open(struct lvfs_run_ctxt *ctxt, struct l_dentry *de, int flags) { mntget(ctxt->pwdmnt); - return dentry_open(de, ctxt->pwdmnt, flags); + return ll_dentry_open(de, ctxt->pwdmnt, flags, current_cred()); } EXPORT_SYMBOL(l_dentry_open); -#ifdef HAVE_VFS_READDIR_U64_INO static int l_filldir(void *__buf, const char *name, int namlen, loff_t offset, u64 ino, unsigned int d_type) -#else -static int l_filldir(void *__buf, const char *name, int namlen, loff_t offset, - ino_t ino, unsigned int d_type) -#endif { struct l_linux_dirent *dirent; struct l_readdir_callback *buf = (struct l_readdir_callback *)__buf; @@ -390,7 +403,7 @@ static int l_filldir(void *__buf, const char *name, int namlen, loff_t offset, if (!dirent) return -ENOMEM; - list_add_tail(&dirent->lld_list, buf->lrc_list); + cfs_list_add_tail(&dirent->lld_list, buf->lrc_list); buf->lrc_dirent = dirent; dirent->lld_ino = ino; @@ -400,7 +413,7 @@ static int l_filldir(void *__buf, const char *name, int namlen, loff_t offset, return 0; } -long l_readdir(struct file *file, struct list_head *dentry_list) +long l_readdir(struct file *file, cfs_list_t *dentry_list) { struct l_linux_dirent *lastdirent; struct l_readdir_callback buf; @@ -421,6 +434,58 @@ long l_readdir(struct file *file, struct list_head *dentry_list) } EXPORT_SYMBOL(l_readdir); +int l_notify_change(struct vfsmount *mnt, struct dentry *dchild, + struct iattr *newattrs) +{ + int rc; + + LOCK_INODE_MUTEX(dchild->d_inode); +#ifdef HAVE_SECURITY_PLUG + rc = notify_change(dchild, mnt, newattrs); +#else + rc = notify_change(dchild, newattrs); +#endif + UNLOCK_INODE_MUTEX(dchild->d_inode); + return rc; +} +EXPORT_SYMBOL(l_notify_change); + +/* utility to truncate a file */ +int simple_truncate(struct dentry *dir, struct vfsmount *mnt, + char *name, loff_t length) +{ + struct dentry *dchild; + struct iattr newattrs; + int err = 0; + ENTRY; + + CDEBUG(D_INODE, "truncating file %.*s to %lld\n", (int)strlen(name), + name, (long long)length); + dchild = ll_lookup_one_len(name, dir, strlen(name)); + if (IS_ERR(dchild)) + GOTO(out, err = PTR_ERR(dchild)); + + if (dchild->d_inode) { + int old_mode = dchild->d_inode->i_mode; + if (S_ISDIR(old_mode)) { + CERROR("found %s (%lu/%u) is mode %o\n", name, + dchild->d_inode->i_ino, + dchild->d_inode->i_generation, old_mode); + GOTO(out_dput, err = -EISDIR); + } + + newattrs.ia_size = length; + newattrs.ia_valid = ATTR_SIZE; + err = l_notify_change(mnt, dchild, &newattrs); + } + EXIT; +out_dput: + dput(dchild); +out: + return err; +} +EXPORT_SYMBOL(simple_truncate); + #ifdef LUSTRE_KERNEL_VERSION #ifndef HAVE_CLEAR_RDONLY_ON_PUT #error rdonly patchset must be updated [cfs bz11248] @@ -475,12 +540,12 @@ void obd_update_maxusage() max1 = obd_pages_sum(); max2 = obd_memory_sum(); - spin_lock(&obd_updatemax_lock); + cfs_spin_lock(&obd_updatemax_lock); if (max1 > obd_max_pages) obd_max_pages = max1; if (max2 > obd_max_alloc) obd_max_alloc = max2; - spin_unlock(&obd_updatemax_lock); + cfs_spin_unlock(&obd_updatemax_lock); } @@ -488,9 +553,9 @@ __u64 obd_memory_max(void) { __u64 ret; - spin_lock(&obd_updatemax_lock); + cfs_spin_lock(&obd_updatemax_lock); ret = obd_max_alloc; - spin_unlock(&obd_updatemax_lock); + cfs_spin_unlock(&obd_updatemax_lock); return ret; } @@ -499,9 +564,9 @@ __u64 obd_pages_max(void) { __u64 ret; - spin_lock(&obd_updatemax_lock); + cfs_spin_lock(&obd_updatemax_lock); ret = obd_max_pages; - spin_unlock(&obd_updatemax_lock); + cfs_spin_unlock(&obd_updatemax_lock); return ret; } @@ -521,14 +586,14 @@ __s64 lprocfs_read_helper(struct lprocfs_counter *lc, if (!lc) RETURN(0); do { - centry = atomic_read(&lc->lc_cntl.la_entry); + centry = cfs_atomic_read(&lc->lc_cntl.la_entry); switch (field) { case LPROCFS_FIELDS_FLAGS_CONFIG: ret = lc->lc_config; break; case LPROCFS_FIELDS_FLAGS_SUM: - ret = lc->lc_sum; + ret = lc->lc_sum + lc->lc_sum_irq; break; case LPROCFS_FIELDS_FLAGS_MIN: ret = lc->lc_min; @@ -548,8 +613,8 @@ __s64 lprocfs_read_helper(struct lprocfs_counter *lc, default: break; }; - } while (centry != atomic_read(&lc->lc_cntl.la_entry) && - centry != atomic_read(&lc->lc_cntl.la_exit)); + } while (centry != cfs_atomic_read(&lc->lc_cntl.la_entry) && + centry != cfs_atomic_read(&lc->lc_cntl.la_exit)); RETURN(ret); }