X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Flvfs%2Flvfs_linux.c;h=7e010513133de29fc7481d372880c7b5365fec22;hb=d031e92fe730792e3a4dba2f1e8ae90a085c96c5;hp=d16549bdd3146fc282b38f87119c4fe7f630bb7d;hpb=70e80ade90af09300396706b8910e196a7928520;p=fs%2Flustre-release.git diff --git a/lustre/lvfs/lvfs_linux.c b/lustre/lvfs/lvfs_linux.c index d16549b..7e01051 100644 --- a/lustre/lvfs/lvfs_linux.c +++ b/lustre/lvfs/lvfs_linux.c @@ -16,8 +16,8 @@ * in the LICENSE file that accompanied this code). * * You should have received a copy of the GNU General Public License - * version 2 along with this program; If not, see [sun.com URL with a - * copy of GPLv2]. + * version 2 along with this program; If not, see + * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf * * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, * CA 95054 USA or visit www.sun.com if you need additional information or @@ -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 */ @@ -116,22 +116,11 @@ void push_ctxt(struct lvfs_run_ctxt *save, struct lvfs_run_ctxt *new_ctx, ASSERT_CTXT_MAGIC(new_ctx->magic); OBD_SET_CTXT_MAGIC(save); - /* - CDEBUG(D_INFO, - "= push %p->%p = cur fs %p pwd %p:d%d:i%d (%.*s), pwdmnt %p:%d\n", - save, current, current->fs, current->fs->pwd, - atomic_read(¤t->fs->pwd->d_count), - atomic_read(¤t->fs->pwd->d_inode->i_count), - current->fs->pwd->d_name.len, current->fs->pwd->d_name.name, - current->fs->pwdmnt, - atomic_read(¤t->fs->pwdmnt->mnt_count)); - */ - 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); + 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 = current->fs->umask; save->ngroups = current->group_info->ngroups; @@ -161,43 +150,19 @@ void push_ctxt(struct lvfs_run_ctxt *save, struct lvfs_run_ctxt *new_ctx, current->fs->umask = 0; /* umask already applied on client */ set_fs(new_ctx->fs); ll_set_fs_pwd(current->fs, new_ctx->pwdmnt, new_ctx->pwd); - - /* - CDEBUG(D_INFO, - "= push %p->%p = cur fs %p pwd %p:d%d:i%d (%.*s), pwdmnt %p:%d\n", - new_ctx, current, current->fs, current->fs->pwd, - atomic_read(¤t->fs->pwd->d_count), - atomic_read(¤t->fs->pwd->d_inode->i_count), - current->fs->pwd->d_name.len, current->fs->pwd->d_name.name, - current->fs->pwdmnt, - atomic_read(¤t->fs->pwdmnt->mnt_count)); - */ } EXPORT_SYMBOL(push_ctxt); void pop_ctxt(struct lvfs_run_ctxt *saved, struct lvfs_run_ctxt *new_ctx, struct lvfs_ucred *uc) { - //printk("pc0"); ASSERT_CTXT_MAGIC(saved->magic); - //printk("pc1"); ASSERT_KERNEL_CTXT("popping non-kernel context!\n"); - /* - CDEBUG(D_INFO, - " = pop %p==%p = cur %p pwd %p:d%d:i%d (%.*s), pwdmnt %p:%d\n", - new_ctx, current, current->fs, current->fs->pwd, - atomic_read(¤t->fs->pwd->d_count), - atomic_read(¤t->fs->pwd->d_inode->i_count), - current->fs->pwd->d_name.len, current->fs->pwd->d_name.name, - current->fs->pwdmnt, - atomic_read(¤t->fs->pwdmnt->mnt_count)); - */ - - 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); @@ -216,17 +181,6 @@ void pop_ctxt(struct lvfs_run_ctxt *saved, struct lvfs_run_ctxt *new_ctx, uc->luc_identity ? uc->luc_identity->mi_ginfo : NULL); } - - /* - CDEBUG(D_INFO, - "= pop %p->%p = cur fs %p pwd %p:d%d:i%d (%.*s), pwdmnt %p:%d\n", - saved, current, current->fs, current->fs->pwd, - atomic_read(¤t->fs->pwd->d_count), - atomic_read(¤t->fs->pwd->d_inode->i_count), - current->fs->pwd->d_name.len, current->fs->pwd->d_name.name, - current->fs->pwdmnt, - atomic_read(¤t->fs->pwdmnt->mnt_count)); - */ } EXPORT_SYMBOL(pop_ctxt); @@ -276,7 +230,8 @@ out_up: EXPORT_SYMBOL(simple_mknod); /* utility to make a directory */ -struct dentry *simple_mkdir(struct dentry *dir, char *name, int mode, int fix) +struct dentry *simple_mkdir(struct dentry *dir, struct vfsmount *mnt, + const char *name, int mode, int fix) { struct dentry *dchild; int err = 0; @@ -299,7 +254,7 @@ struct dentry *simple_mkdir(struct dentry *dir, char *name, int mode, int fix) /* Fixup directory permissions if necessary */ if (fix && (old_mode & S_IALLUGO) != (mode & S_IALLUGO)) { - CDEBUG(D_CONFIG, + CDEBUG(D_CONFIG, "fixing permissions on %s from %o to %o\n", name, old_mode, mode); dchild->d_inode->i_mode = (mode & S_IALLUGO) | @@ -309,7 +264,7 @@ struct dentry *simple_mkdir(struct dentry *dir, char *name, int mode, int fix) GOTO(out_up, dchild); } - err = vfs_mkdir(dir->d_inode, dchild, mode); + err = ll_vfs_mkdir(dir->d_inode, dchild, mnt, mode); if (err) GOTO(out_err, err); @@ -324,28 +279,30 @@ out_up: EXPORT_SYMBOL(simple_mkdir); /* utility to rename a file */ -int lustre_rename(struct dentry *dir, char *oldname, char *newname) +int lustre_rename(struct dentry *dir, struct vfsmount *mnt, + char *oldname, char *newname) { struct dentry *dchild_old, *dchild_new; int err = 0; ENTRY; ASSERT_KERNEL_CTXT("kernel doing rename outside kernel context\n"); - CDEBUG(D_INODE, "renaming file %.*s to %.*s\n", + CDEBUG(D_INODE, "renaming file %.*s to %.*s\n", (int)strlen(oldname), oldname, (int)strlen(newname), newname); dchild_old = ll_lookup_one_len(oldname, dir, strlen(oldname)); if (IS_ERR(dchild_old)) RETURN(PTR_ERR(dchild_old)); - if (!dchild_old->d_inode) + if (!dchild_old->d_inode) GOTO(put_old, err = -ENOENT); dchild_new = ll_lookup_one_len(newname, dir, strlen(newname)); if (IS_ERR(dchild_new)) GOTO(put_old, err = PTR_ERR(dchild_new)); - err = vfs_rename(dir->d_inode, dchild_old, dir->d_inode, dchild_new); + err = ll_vfs_rename(dir->d_inode, dchild_old, mnt, + dir->d_inode, dchild_new, mnt); dput(dchild_new); put_old: @@ -405,6 +362,7 @@ 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) { @@ -433,7 +391,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; @@ -443,7 +401,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; @@ -464,6 +422,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] @@ -473,7 +483,6 @@ int dev_check_rdonly(lvfs_sbdev_type dev); void __lvfs_set_rdonly(lvfs_sbdev_type dev, lvfs_sbdev_type jdev) { - lvfs_sbdev_sync(dev); if (jdev && (jdev != dev)) { CDEBUG(D_IOCTL | D_HA, "set journal dev %lx rdonly\n", (long)jdev); @@ -519,22 +528,22 @@ 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); + } __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; } @@ -543,9 +552,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; } @@ -565,14 +574,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; @@ -592,8 +601,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); }