X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Flvfs%2Flvfs_linux.c;h=53147a4a9f0f69fd815a7227021cab8011c0d24e;hb=ed8bd8739e951a6a1b3bfcb62d0af3dff9e30a42;hp=4118a53d0ca9d9a300a86ce6df0513517b5051ee;hpb=b91058999ccd0e34bcc689acd1afdcad24de5590;p=fs%2Flustre-release.git diff --git a/lustre/lvfs/lvfs_linux.c b/lustre/lvfs/lvfs_linux.c index 4118a53..53147a4 100644 --- a/lustre/lvfs/lvfs_linux.c +++ b/lustre/lvfs/lvfs_linux.c @@ -37,30 +37,28 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include -#include +#include #include "lvfs_internal.h" -#include -#include -#include /* for mds_grp_hash_entry */ +#include +#include +#include atomic_t obd_memory; int obd_memmax; - /* Debugging check only needed during development */ #ifdef OBD_CTXT_DEBUG # define ASSERT_CTXT_MAGIC(magic) LASSERT((magic) == OBD_RUN_CTXT_MAGIC) # define ASSERT_NOT_KERNEL_CTXT(msg) LASSERTF(!segment_eq(get_fs(), get_ds()),\ msg) # define ASSERT_KERNEL_CTXT(msg) LASSERTF(segment_eq(get_fs(), get_ds()), msg) - #else # define ASSERT_CTXT_MAGIC(magic) do {} while(0) # define ASSERT_NOT_KERNEL_CTXT(msg) do {} while(0) @@ -68,8 +66,10 @@ int obd_memmax; #endif static void push_group_info(struct lvfs_run_ctxt *save, - struct group_info *ginfo) + struct upcall_cache_entry *uce) { + struct group_info *ginfo = uce ? uce->ue_group_info : NULL; + if (!ginfo) { save->ngroups = current_ngroups; current_ngroups = 0; @@ -81,23 +81,26 @@ static void push_group_info(struct lvfs_run_ctxt *save, task_unlock(current); #else LASSERT(ginfo->ngroups <= NGROUPS); + LASSERT(current->ngroups <= NGROUPS_SMALL); /* save old */ save->group_info.ngroups = current->ngroups; if (current->ngroups) memcpy(save->group_info.small_block, current->groups, - current->ngroups); + current->ngroups * sizeof(gid_t)); /* push new */ current->ngroups = ginfo->ngroups; if (ginfo->ngroups) memcpy(current->groups, ginfo->small_block, - current->ngroups); + current->ngroups * sizeof(gid_t)); #endif } } static void pop_group_info(struct lvfs_run_ctxt *save, - struct group_info *ginfo) + struct upcall_cache_entry *uce) { + struct group_info *ginfo = uce ? uce->ue_group_info : NULL; + if (!ginfo) { current_ngroups = save->ngroups; } else { @@ -106,10 +109,10 @@ static void pop_group_info(struct lvfs_run_ctxt *save, current->group_info = save->group_info; task_unlock(current); #else - current->ngroups = ginfo->ngroups; + current->ngroups = save->group_info.ngroups; if (current->ngroups) memcpy(current->groups, save->group_info.small_block, - current->ngroups); + current->ngroups * sizeof(gid_t)); #endif } } @@ -120,13 +123,11 @@ void push_ctxt(struct lvfs_run_ctxt *save, struct lvfs_run_ctxt *new_ctx, { //ASSERT_NOT_KERNEL_CTXT("already in kernel context!\n"); ASSERT_CTXT_MAGIC(new_ctx->magic); - LASSERT(save->magic != OBD_RUN_CTXT_MAGIC || save->pid != current->pid); OBD_SET_CTXT_MAGIC(save); - save->pid = current->pid; /* CDEBUG(D_INFO, - "= push %p->%p = cur fs %p pwd %p:d%d:i%d (%*s), pwdmnt %p:%d\n", + "= 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), @@ -140,7 +141,6 @@ void push_ctxt(struct lvfs_run_ctxt *save, struct lvfs_run_ctxt *new_ctx, LASSERT(atomic_read(&new_ctx->pwd->d_count)); save->pwd = dget(current->fs->pwd); save->pwdmnt = mntget(current->fs->pwdmnt); - save->ngroups = current_ngroups; save->luc.luc_umask = current->fs->umask; LASSERT(save->pwd); @@ -156,16 +156,15 @@ void push_ctxt(struct lvfs_run_ctxt *save, struct lvfs_run_ctxt *new_ctx, current->fsuid = uc->luc_fsuid; current->fsgid = uc->luc_fsgid; current->cap_effective = uc->luc_cap; - - push_group_info(save, uc->luc_ginfo); + push_group_info(save, uc->luc_uce); } current->fs->umask = 0; /* umask already applied on client */ set_fs(new_ctx->fs); - set_fs_pwd(current->fs, new_ctx->pwdmnt, new_ctx->pwd); + 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", + "= 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), @@ -181,15 +180,12 @@ void pop_ctxt(struct lvfs_run_ctxt *saved, struct lvfs_run_ctxt *new_ctx, { //printk("pc0"); ASSERT_CTXT_MAGIC(saved->magic); - LASSERT(saved->pid == current->pid); - saved->magic = 0; - saved->pid = 0; //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", + " = 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), @@ -198,11 +194,13 @@ void pop_ctxt(struct lvfs_run_ctxt *saved, struct lvfs_run_ctxt *new_ctx, atomic_read(¤t->fs->pwdmnt->mnt_count)); */ - LASSERT(current->fs->pwd == new_ctx->pwd); - LASSERT(current->fs->pwdmnt == new_ctx->pwdmnt); + 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); set_fs(saved->fs); - set_fs_pwd(current->fs, saved->pwdmnt, saved->pwd); + ll_set_fs_pwd(current->fs, saved->pwdmnt, saved->pwd); dput(saved->pwd); mntput(saved->pwdmnt); @@ -211,13 +209,12 @@ void pop_ctxt(struct lvfs_run_ctxt *saved, struct lvfs_run_ctxt *new_ctx, current->fsuid = saved->luc.luc_fsuid; current->fsgid = saved->luc.luc_fsgid; current->cap_effective = saved->luc.luc_cap; - - pop_group_info(saved, uc->luc_ginfo); + pop_group_info(saved, uc->luc_uce); } /* CDEBUG(D_INFO, - "= pop %p->%p = cur fs %p pwd %p:d%d:i%d (%*s), pwdmnt %p:%d\n", + "= 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), @@ -236,7 +233,7 @@ struct dentry *simple_mknod(struct dentry *dir, char *name, int mode, int fix) ENTRY; ASSERT_KERNEL_CTXT("kernel doing mknod outside kernel context\n"); - CDEBUG(D_INODE, "creating file %*s\n", (int)strlen(name), name); + CDEBUG(D_INODE, "creating file %.*s\n", (int)strlen(name), name); dchild = ll_lookup_one_len(name, dir, strlen(name)); if (IS_ERR(dchild)) @@ -281,20 +278,25 @@ struct dentry *simple_mkdir(struct dentry *dir, char *name, int mode, int fix) ENTRY; ASSERT_KERNEL_CTXT("kernel doing mkdir outside kernel context\n"); - CDEBUG(D_INODE, "creating directory %*s\n", (int)strlen(name), name); + CDEBUG(D_INODE, "creating directory %.*s\n", (int)strlen(name), name); dchild = ll_lookup_one_len(name, dir, strlen(name)); if (IS_ERR(dchild)) GOTO(out_up, dchild); if (dchild->d_inode) { int old_mode = dchild->d_inode->i_mode; - if (!S_ISDIR(old_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_err, err = -ENOTDIR); + } /* Fixup directory permissions if necessary */ if (fix && (old_mode & S_IALLUGO) != (mode & S_IALLUGO)) { - CWARN("fixing permissions on %s from %o to %o\n", - name, old_mode, mode); + CDEBUG(D_CONFIG, + "fixing permissions on %s from %o to %o\n", + name, old_mode, mode); dchild->d_inode->i_mode = (mode & S_IALLUGO) | (old_mode & ~S_IALLUGO); mark_inode_dirty(dchild->d_inode); @@ -316,6 +318,37 @@ out_up: } EXPORT_SYMBOL(simple_mkdir); +/* utility to rename a file */ +int lustre_rename(struct dentry *dir, 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", + (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) + 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); + + dput(dchild_new); +put_old: + dput(dchild_old); + RETURN(err); +} +EXPORT_SYMBOL(lustre_rename); + /* * Read a file from within kernel context. Prior to calling this * function we should already have done a push_ctxt(). @@ -375,18 +408,26 @@ struct l_file *l_dentry_open(struct lvfs_run_ctxt *ctxt, struct l_dentry *de, } 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; - + dirent = buf->lrc_dirent; if (dirent) - dirent->lld_off = offset; + dirent->lld_off = offset; OBD_ALLOC(dirent, sizeof(*dirent)); + if (!dirent) + return -ENOMEM; + list_add_tail(&dirent->lld_list, buf->lrc_list); buf->lrc_dirent = dirent; @@ -420,6 +461,55 @@ EXPORT_SYMBOL(l_readdir); EXPORT_SYMBOL(obd_memory); EXPORT_SYMBOL(obd_memmax); +#ifdef LUSTRE_KERNEL_VERSION +#ifndef HAVE_CLEAR_RDONLY_ON_PUT +#error rdonly patchset must be updated [cfs bz11248] +#endif + +void dev_set_rdonly(lvfs_sbdev_type dev); +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); + dev_set_rdonly(jdev); + } + CDEBUG(D_IOCTL | D_HA, "set dev %lx rdonly\n", (long)dev); + dev_set_rdonly(dev); +} + +int lvfs_check_rdonly(lvfs_sbdev_type dev) +{ + return dev_check_rdonly(dev); +} + +EXPORT_SYMBOL(__lvfs_set_rdonly); +EXPORT_SYMBOL(lvfs_check_rdonly); +#endif /* LUSTRE_KERNEL_VERSION */ + +int lvfs_check_io_health(struct obd_device *obd, struct file *file) +{ + char *write_page = NULL; + loff_t offset = 0; + int rc = 0; + ENTRY; + + OBD_ALLOC(write_page, CFS_PAGE_SIZE); + if (!write_page) + RETURN(-ENOMEM); + + rc = fsfilt_write_record(obd, file, write_page, CFS_PAGE_SIZE, &offset, 1); + + OBD_FREE(write_page, CFS_PAGE_SIZE); + + CDEBUG(D_INFO, "write 1 page synchronously for checking io rc %d\n",rc); + RETURN(rc); +} +EXPORT_SYMBOL(lvfs_check_io_health); + static int __init lvfs_linux_init(void) { RETURN(0); @@ -434,6 +524,7 @@ static void __exit lvfs_linux_exit(void) CDEBUG(leaked ? D_ERROR : D_INFO, "obd mem max: %d leaked: %d\n", obd_memmax, leaked); + EXIT; return; }