Whamcloud - gitweb
Branch HEAD
[fs/lustre-release.git] / lustre / llite / dir.c
index 6ac70be..2549009 100644 (file)
 /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
  * vim:expandtab:shiftwidth=8:tabstop=8:
  *
- * Copyright (C) 1992, 1993, 1994, 1995
- * Remy Card (card@masi.ibp.fr)
- * Laboratoire MASI - Institut Blaise Pascal
- * Universite Pierre et Marie Curie (Paris VI)
+ * GPL HEADER START
  *
- *  from
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  linux/fs/minix/dir.c
- *  linux/fs/ext2/dir.c
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 only,
+ * as published by the Free Software Foundation.
  *
- *  Copyright (C) 1991, 1992  Linus Torvalds
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License version 2 for more details (a copy is included
+ * in the LICENSE file that accompanied this code).
  *
- *  ext2 directory handling functions
+ * You should have received a copy of the GNU General Public License
+ * version 2 along with this program; If not, see
+ * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
  *
- *  Big-endian to little-endian byte-swapping/bitmaps by
- *        David S. Miller (davem@caip.rutgers.edu), 1995
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
  *
- *  All code that works with directory layout had been switched to pagecache
- *  and moved here. AV
+ * GPL HEADER END
+ */
+/*
+ * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Use is subject to license terms.
+ */
+/*
+ * This file is part of Lustre, http://www.lustre.org/
+ * Lustre is a trademark of Sun Microsystems, Inc.
  *
- *  Adapted for Lustre Light
- *  Copyright (C) 2002-2003, Cluster File Systems, Inc.
+ * lustre/llite/dir.c
  *
+ * Directory code for lustre client.
  */
 
 #include <linux/fs.h>
-#include <linux/ext2_fs.h>
 #include <linux/pagemap.h>
 #include <linux/mm.h>
 #include <linux/version.h>
 #include <linux/smp_lock.h>
 #include <asm/uaccess.h>
-#include <linux/file.h>
-#include <linux/kmod.h>
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-# include <linux/locks.h>   // for wait_on_buffer
-#else
-# include <linux/buffer_head.h>   // for wait_on_buffer
-#endif
+#include <linux/buffer_head.h>   // for wait_on_buffer
 
 #define DEBUG_SUBSYSTEM S_LLITE
 
-#include <linux/obd_support.h>
-#include <linux/obd_class.h>
-#include <linux/lustre_lib.h>
-#include <linux/lustre_idl.h>
-#include <linux/lustre_mds.h>
-#include <linux/lustre_lite.h>
-#include <linux/lustre_dlm.h>
+#include <obd_support.h>
+#include <obd_class.h>
+#include <lustre_lib.h>
+#include <lustre/lustre_idl.h>
+#include <lustre_lite.h>
+#include <lustre_dlm.h>
+#include <lustre_fid.h>
 #include "llite_internal.h"
 
-typedef struct ext2_dir_entry_2 ext2_dirent;
+#ifndef HAVE_PAGE_CHECKED
+#ifdef HAVE_PG_FS_MISC
+#define PageChecked(page)        test_bit(PG_fs_misc, &(page)->flags)
+#define SetPageChecked(page)     set_bit(PG_fs_misc, &(page)->flags)
+#else
+#error PageChecked or PageFsMisc not defined in kernel
+#endif
+#endif
 
-#define PageChecked(page)        test_bit(PG_checked, &(page)->flags)
-#define SetPageChecked(page)     set_bit(PG_checked, &(page)->flags)
+/*
+ * (new) readdir implementation overview.
+ *
+ * Original lustre readdir implementation cached exact copy of raw directory
+ * pages on the client. These pages were indexed in client page cache by
+ * logical offset in the directory file. This design, while very simple and
+ * intuitive had some inherent problems:
+ *
+ *     . it implies that byte offset to the directory entry serves as a
+ *     telldir(3)/seekdir(3) cookie, but that offset is not stable: in
+ *     ext3/htree directory entries may move due to splits, and more
+ *     importantly,
+ *
+ *     . it is incompatible with the design of split directories for cmd3,
+ *     that assumes that names are distributed across nodes based on their
+ *     hash, and so readdir should be done in hash order.
+ *
+ * New readdir implementation does readdir in hash order, and uses hash of a
+ * file name as a telldir/seekdir cookie. This led to number of complications:
+ *
+ *     . hash is not unique, so it cannot be used to index cached directory
+ *     pages on the client (note, that it requires a whole pageful of hash
+ *     collided entries to cause two pages to have identical hashes);
+ *
+ *     . hash is not unique, so it cannot, strictly speaking, be used as an
+ *     entry cookie. ext3/htree has the same problem and lustre implementation
+ *     mimics their solution: seekdir(hash) positions directory at the first
+ *     entry with the given hash.
+ *
+ * Client side.
+ *
+ * 0. caching
+ *
+ * Client caches directory pages using hash of the first entry as an index. As
+ * noted above hash is not unique, so this solution doesn't work as is:
+ * special processing is needed for "page hash chains" (i.e., sequences of
+ * pages filled with entries all having the same hash value).
+ *
+ * First, such chains have to be detected. To this end, server returns to the
+ * client the hash of the first entry on the page next to one returned. When
+ * client detects that this hash is the same as hash of the first entry on the
+ * returned page, page hash collision has to be handled. Pages in the
+ * hash chain, except first one, are termed "overflow pages".
+ *
+ * Solution to index uniqueness problem is to not cache overflow
+ * pages. Instead, when page hash collision is detected, all overflow pages
+ * from emerging chain are immediately requested from the server and placed in
+ * a special data structure (struct ll_dir_chain). This data structure is used
+ * by ll_readdir() to process entries from overflow pages. When readdir
+ * invocation finishes, overflow pages are discarded. If page hash collision
+ * chain weren't completely processed, next call to readdir will again detect
+ * page hash collision, again read overflow pages in, process next portion of
+ * entries and again discard the pages. This is not as wasteful as it looks,
+ * because, given reasonable hash, page hash collisions are extremely rare.
+ *
+ * 1. directory positioning
+ *
+ * When seekdir(hash) is called, original
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ * Server.
+ *
+ * identification of and access to overflow pages
+ *
+ * page format
+ *
+ *
+ *
+ *
+ *
+ */
 
 /* returns the page unlocked, but with a reference */
 static int ll_dir_readpage(struct file *file, struct page *page)
 {
         struct inode *inode = page->mapping->host;
-        struct ll_fid mdc_fid;
-        __u64 offset;
         struct ptlrpc_request *request;
-        struct mds_body *body;
-        int rc = 0;
+        struct mdt_body *body;
+        struct obd_capa *oc;
+        __u64 hash;
+        int rc;
         ENTRY;
 
-        CDEBUG(D_VFSTRACE, "VFS Op:inode=%lu/%u(%p)\n", inode->i_ino,
-               inode->i_generation, inode);
+        hash = (__u64)hash_x_index(page->index);
+        CDEBUG(D_VFSTRACE, "VFS Op:inode=%lu/%u(%p) off %lu\n",
+               inode->i_ino, inode->i_generation, inode, (unsigned long)hash);
 
-        mdc_pack_fid(&mdc_fid, inode->i_ino, inode->i_generation, S_IFDIR);
-        mdc_fid.mds = ll_i2info(inode)->lli_mds;
-        offset = page->index << PAGE_SHIFT;
-        rc = md_readpage(ll_i2sbi(inode)->ll_mdc_exp, &mdc_fid,
-                         offset, page, &request);
+        oc = ll_mdscapa_get(inode);
+        rc = md_readpage(ll_i2sbi(inode)->ll_md_exp, ll_inode2fid(inode),
+                         oc, hash, page, &request);
+        capa_put(oc);
         if (!rc) {
-                body = lustre_msg_buf(request->rq_repmsg, 0, sizeof (*body));
-                LASSERT (body != NULL);         /* checked by md_readpage() */
-                LASSERT_REPSWABBED (request, 0); /* swabbed by md_readpage() */
-
-#warning "FIXME ASAP!"
-                //inode->i_size = body->size;
+                body = req_capsule_server_get(&request->rq_pill, &RMF_MDT_BODY);
+                /* Checked by mdc_readpage() */
+                LASSERT(body != NULL);
+
+                if (body->valid & OBD_MD_FLSIZE) {
+                        ll_inode_size_lock(inode, 0);
+                        i_size_write(inode, body->size);
+                        ll_inode_size_unlock(inode, 0);
+                }
                 SetPageUptodate(page);
         }
         ptlrpc_req_finished(request);
@@ -96,140 +186,116 @@ struct address_space_operations ll_dir_aops = {
         .readpage  = ll_dir_readpage,
 };
 
-/*
- * ext2 uses block-sized chunks. Arguably, sector-sized ones would be
- * more robust, but we have what we have
- */
-static inline unsigned ext2_chunk_size(struct inode *inode)
+static void ll_check_page(struct inode *dir, struct page *page)
 {
-        return inode->i_sb->s_blocksize;
+        /* XXX: check page format later */
+        SetPageChecked(page);
 }
 
-static inline void ext2_put_page(struct page *page)
+static void ll_release_page(struct page *page, __u64 hash,
+                            __u64 start, __u64 end)
 {
         kunmap(page);
+        lock_page(page);
+        if (likely(page->mapping != NULL)) {
+                ll_truncate_complete_page(page);
+                unlock_page(page);
+        } else {
+                unlock_page(page);
+                CWARN("NULL mapping page %p, truncated by others: "
+                      "hash("LPX64") | start("LPX64") | end("LPX64")\n",
+                      page, hash, start, end);
+        }
         page_cache_release(page);
 }
 
-static inline unsigned long dir_pages(struct inode *inode)
-{
-        return (inode->i_size+PAGE_CACHE_SIZE-1)>>PAGE_CACHE_SHIFT;
-}
-
-
-static void ext2_check_page(struct page *page)
+/*
+ * Find, kmap and return page that contains given hash.
+ */
+static struct page *ll_dir_page_locate(struct inode *dir, __u64 hash,
+                                       __u64 *start, __u64 *end)
 {
-        struct inode *dir = page->mapping->host;
-        unsigned chunk_size = ext2_chunk_size(dir);
-        char *kaddr = page_address(page);
-        //      u32 max_inumber = le32_to_cpu(sb->u.ext2_sb.s_es->s_inodes_count);
-        unsigned offs, rec_len;
-        unsigned limit = PAGE_CACHE_SIZE;
-        ext2_dirent *p;
-        char *error;
-
-        if ((dir->i_size >> PAGE_CACHE_SHIFT) == page->index) {
-                limit = dir->i_size & ~PAGE_CACHE_MASK;
-                if (limit & (chunk_size - 1)) {
-                        CERROR("limit %d dir size %lld index %ld\n",
-                               limit, dir->i_size, page->index);
-                        goto Ebadsize;
-                }
-                for (offs = limit; offs<PAGE_CACHE_SIZE; offs += chunk_size) {
-                        ext2_dirent *p = (ext2_dirent*)(kaddr + offs);
-                        p->rec_len = cpu_to_le16(chunk_size);
-                        p->name_len = 0;
-                        p->inode = 0;
+        struct address_space *mapping = dir->i_mapping;
+        /*
+         * Complement of hash is used as an index so that
+         * radix_tree_gang_lookup() can be used to find a page with starting
+         * hash _smaller_ than one we are looking for.
+         */
+        unsigned long offset = hash_x_index((unsigned long)hash);
+        struct page *page;
+        int found;
+
+        TREE_READ_LOCK_IRQ(mapping);
+        found = radix_tree_gang_lookup(&mapping->page_tree,
+                                       (void **)&page, offset, 1);
+        if (found > 0) {
+                struct lu_dirpage *dp;
+
+                page_cache_get(page);
+                TREE_READ_UNLOCK_IRQ(mapping);
+                /*
+                 * In contrast to find_lock_page() we are sure that directory
+                 * page cannot be truncated (while DLM lock is held) and,
+                 * hence, can avoid restart.
+                 *
+                 * In fact, page cannot be locked here at all, because
+                 * ll_dir_readpage() does synchronous io.
+                 */
+                wait_on_page(page);
+                if (PageUptodate(page)) {
+                        dp = kmap(page);
+                        *start = le64_to_cpu(dp->ldp_hash_start);
+                        *end   = le64_to_cpu(dp->ldp_hash_end);
+                        LASSERT(*start <= hash);
+                        if (hash > *end || (*end != *start && hash == *end)) {
+                                ll_release_page(page, hash, *start, *end);
+                                page = NULL;
+                        }
+                } else {
+                        page_cache_release(page);
+                        page = ERR_PTR(-EIO);
                 }
-                if (!limit)
-                        goto out;
-        }
-        for (offs = 0; offs <= limit - EXT2_DIR_REC_LEN(1); offs += rec_len) {
-                p = (ext2_dirent *)(kaddr + offs);
-                rec_len = le16_to_cpu(p->rec_len);
-
-                if (rec_len < EXT2_DIR_REC_LEN(1))
-                        goto Eshort;
-                if (rec_len & 3)
-                        goto Ealign;
-                if (rec_len < EXT2_DIR_REC_LEN(p->name_len))
-                        goto Enamelen;
-                if (((offs + rec_len - 1) ^ offs) & ~(chunk_size-1))
-                        goto Espan;
-                //              if (le32_to_cpu(p->inode) > max_inumber)
-                //goto Einumber;
+
+        } else {
+                TREE_READ_UNLOCK_IRQ(mapping);
+                page = NULL;
         }
-        if (offs != limit)
-                goto Eend;
-out:
-        SetPageChecked(page);
-        return;
-
-        /* Too bad, we had an error */
-
-Ebadsize:
-        CERROR("ext2_check_page"
-                "size of directory #%lu is not a multiple of chunk size\n",
-                dir->i_ino
-        );
-        goto fail;
-Eshort:
-        error = "rec_len is smaller than minimal";
-        goto bad_entry;
-Ealign:
-        error = "unaligned directory entry";
-        goto bad_entry;
-Enamelen:
-        error = "rec_len is too small for name_len";
-        goto bad_entry;
-Espan:
-        error = "directory entry across blocks";
-        goto bad_entry;
-        //Einumber:
-        // error = "inode out of bounds";
-bad_entry:
-        CERROR("ext2_check_page: bad entry in directory #%lu: %s - "
-                "offset=%lu+%u, inode=%lu, rec_len=%d, name_len=%d",
-                dir->i_ino, error, (page->index<<PAGE_CACHE_SHIFT), offs,
-                (unsigned long) le32_to_cpu(p->inode),
-                rec_len, p->name_len);
-        goto fail;
-Eend:
-        p = (ext2_dirent *)(kaddr + offs);
-        CERROR("ext2_check_page"
-                "entry in directory #%lu spans the page boundary"
-                "offset=%lu, inode=%lu",
-                dir->i_ino, (page->index<<PAGE_CACHE_SHIFT)+offs,
-                (unsigned long) le32_to_cpu(p->inode));
-fail:
-        SetPageChecked(page);
-        SetPageError(page);
+        return page;
 }
 
-static struct page *ll_get_dir_page(struct inode *dir, unsigned long n)
+struct page *ll_get_dir_page(struct inode *dir, __u64 hash, int exact,
+                             struct ll_dir_chain *chain)
 {
-        struct ldlm_res_id res_id =
-                { .name = { dir->i_ino, (__u64)dir->i_generation} };
-        struct lustre_handle lockh;
-        struct obd_device *obddev = class_exp2obd(ll_i2sbi(dir)->ll_mdc_exp);
+        ldlm_policy_data_t policy = {.l_inodebits = {MDS_INODELOCK_UPDATE} };
         struct address_space *mapping = dir->i_mapping;
+        struct lustre_handle lockh;
+        struct lu_dirpage *dp;
         struct page *page;
-        ldlm_policy_data_t policy = { .l_inodebits = { MDS_INODELOCK_UPDATE } };
+        ldlm_mode_t mode;
         int rc;
+        __u64 start = 0;
+        __u64 end = 0;
 
-        obddev = md_get_real_obd(ll_i2sbi(dir)->ll_mdc_exp, NULL, 0);
-        rc = ldlm_lock_match(obddev->obd_namespace, LDLM_FL_BLOCK_GRANTED,
-                             &res_id, LDLM_IBITS, &policy, LCK_PR, &lockh);
+        mode = LCK_PR;
+        rc = md_lock_match(ll_i2sbi(dir)->ll_md_exp, LDLM_FL_BLOCK_GRANTED,
+                           ll_inode2fid(dir), LDLM_IBITS, &policy, mode, &lockh);
         if (!rc) {
+                struct ldlm_enqueue_info einfo = { LDLM_IBITS, mode,
+                       ll_md_blocking_ast, ldlm_completion_ast,
+                       NULL, NULL, dir };
                 struct lookup_intent it = { .it_op = IT_READDIR };
                 struct ptlrpc_request *request;
-                struct mdc_op_data data;
+                struct md_op_data *op_data;
 
-                ll_prepare_mdc_op_data(&data, dir, NULL, NULL, 0, 0);
+                op_data = ll_prep_md_op_data(NULL, dir, NULL, NULL, 0, 0,
+                                             LUSTRE_OPC_ANY, NULL);
+                if (IS_ERR(op_data))
+                        return (void *)op_data;
 
-                rc = md_enqueue(ll_i2sbi(dir)->ll_mdc_exp, LDLM_IBITS, &it,
-                                LCK_PR, &data, &lockh, NULL, 0,
-                                ldlm_completion_ast, ll_mdc_blocking_ast, dir);
+                rc = md_enqueue(ll_i2sbi(dir)->ll_md_exp, &einfo, &it,
+                                op_data, &lockh, NULL, 0, NULL, 0);
+
+                ll_finish_md_op_data(op_data);
 
                 request = (struct ptlrpc_request *)it.d.lustre.it_data;
                 if (request)
@@ -238,176 +304,395 @@ static struct page *ll_get_dir_page(struct inode *dir, unsigned long n)
                         CERROR("lock enqueue: rc: %d\n", rc);
                         return ERR_PTR(rc);
                 }
+        } else {
+                /* for cross-ref object, l_ast_data of the lock may not be set,
+                 * we reset it here */
+                md_set_lock_data(ll_i2sbi(dir)->ll_md_exp, &lockh.cookie,
+                                 dir, NULL);
         }
         ldlm_lock_dump_handle(D_OTHER, &lockh);
 
-        page = read_cache_page(mapping, n,
-                               (filler_t*)mapping->a_ops->readpage, NULL);
-        if (!IS_ERR(page)) {
-                wait_on_page(page);
-                (void)kmap(page);
-                if (!PageUptodate(page))
-                        goto fail;
-                if (!PageChecked(page))
-                        ext2_check_page(page);
-                if (PageError(page))
-                        goto fail;
+        page = ll_dir_page_locate(dir, hash, &start, &end);
+        if (IS_ERR(page))
+                GOTO(out_unlock, page);
+
+        if (page != NULL) {
+                /*
+                 * XXX nikita: not entirely correct handling of a corner case:
+                 * suppose hash chain of entries with hash value HASH crosses
+                 * border between pages P0 and P1. First both P0 and P1 are
+                 * cached, seekdir() is called for some entry from the P0 part
+                 * of the chain. Later P0 goes out of cache. telldir(HASH)
+                 * happens and finds P1, as it starts with matching hash
+                 * value. Remaining entries from P0 part of the chain are
+                 * skipped. (Is that really a bug?)
+                 *
+                 * Possible solutions: 0. don't cache P1 is such case, handle
+                 * it as an "overflow" page. 1. invalidate all pages at
+                 * once. 2. use HASH|1 as an index for P1.
+                 */
+                if (exact && hash != start) {
+                        /*
+                         * readdir asked for a page starting _exactly_ from
+                         * given hash, but cache contains stale page, with
+                         * entries with smaller hash values. Stale page should
+                         * be invalidated, and new one fetched.
+                         */
+                        CWARN("Stale readpage page %p: "LPX64" != "LPX64"\n",
+                              page, hash, start);
+                        ll_release_page(page, hash, start, end);
+                } else {
+                        GOTO(hash_collision, page);
+                }
         }
 
+        page = read_cache_page(mapping, hash_x_index((unsigned long)hash),
+                               (filler_t*)mapping->a_ops->readpage, NULL);
+        if (IS_ERR(page))
+                GOTO(out_unlock, page);
+
+        wait_on_page(page);
+        (void)kmap(page);
+        if (!PageUptodate(page))
+                goto fail;
+        if (!PageChecked(page))
+                ll_check_page(dir, page);
+        if (PageError(page))
+                goto fail;
+hash_collision:
+        dp = page_address(page);
+
+        start = le64_to_cpu(dp->ldp_hash_start);
+        end   = le64_to_cpu(dp->ldp_hash_end);
+        if (end == start) {
+                LASSERT(start == hash);
+                CWARN("Page-wide hash collision: %#lx\n", (unsigned long)end);
+                /*
+                 * Fetch whole overflow chain...
+                 *
+                 * XXX not yet.
+                 */
+                goto fail;
+        }
 out_unlock:
-        ldlm_lock_decref(&lockh, LCK_PR);
+        ldlm_lock_decref(&lockh, mode);
         return page;
 
 fail:
-        ext2_put_page(page);
+        ll_put_page(page);
         page = ERR_PTR(-EIO);
         goto out_unlock;
 }
 
-/*
- * p is at least 6 bytes before the end of page
- */
-static inline ext2_dirent *ext2_next_entry(ext2_dirent *p)
+int ll_readdir(struct file *filp, void *cookie, filldir_t filldir)
 {
-        return (ext2_dirent *)((char*)p + le16_to_cpu(p->rec_len));
-}
+        struct inode         *inode = filp->f_dentry->d_inode;
+        struct ll_inode_info *info  = ll_i2info(inode);
+        struct ll_sb_info    *sbi   = ll_i2sbi(inode);
+        __u64                 pos   = filp->f_pos;
+        struct page          *page;
+        struct ll_dir_chain   chain;
+        int rc;
+        int done;
+        int shift;
+        __u16 type;
+        ENTRY;
 
-static inline unsigned
-ext2_validate_entry(char *base, unsigned offset, unsigned mask)
-{
-        ext2_dirent *de = (ext2_dirent*)(base + offset);
-        ext2_dirent *p = (ext2_dirent*)(base + (offset&mask));
-        while ((char*)p < (char*)de)
-                p = ext2_next_entry(p);
-        return (char *)p - base;
-}
+        CDEBUG(D_VFSTRACE, "VFS Op:inode=%lu/%u(%p) pos %lu/%llu\n",
+               inode->i_ino, inode->i_generation, inode,
+               (unsigned long)pos, i_size_read(inode));
 
-static unsigned char ext2_filetype_table[EXT2_FT_MAX] = {
-        [EXT2_FT_UNKNOWN]       DT_UNKNOWN,
-        [EXT2_FT_REG_FILE]      DT_REG,
-        [EXT2_FT_DIR]           DT_DIR,
-        [EXT2_FT_CHRDEV]        DT_CHR,
-        [EXT2_FT_BLKDEV]        DT_BLK,
-        [EXT2_FT_FIFO]          DT_FIFO,
-        [EXT2_FT_SOCK]          DT_SOCK,
-        [EXT2_FT_SYMLINK]       DT_LNK,
-};
+        if (pos == DIR_END_OFF)
+                /*
+                 * end-of-file.
+                 */
+                RETURN(0);
+
+        rc    = 0;
+        done  = 0;
+        shift = 0;
+        ll_dir_chain_init(&chain);
+
+        page = ll_get_dir_page(inode, pos, 0, &chain);
+
+        while (rc == 0 && !done) {
+                struct lu_dirpage *dp;
+                struct lu_dirent  *ent;
+
+                if (!IS_ERR(page)) {
+                        /*
+                         * If page is empty (end of directory is reached),
+                         * use this value.
+                         */
+                        __u64 hash = DIR_END_OFF;
+                        __u64 next;
+
+                        dp = page_address(page);
+                        for (ent = lu_dirent_start(dp); ent != NULL && !done;
+                             ent = lu_dirent_next(ent)) {
+                                char          *name;
+                                int            namelen;
+                                struct lu_fid  fid;
+                                ino_t          ino;
+
+                                /*
+                                 * XXX: implement correct swabbing here.
+                                 */
+
+                                hash    = le64_to_cpu(ent->lde_hash);
+                                namelen = le16_to_cpu(ent->lde_namelen);
+
+                                if (hash < pos)
+                                        /*
+                                         * Skip until we find target hash
+                                         * value.
+                                         */
+                                        continue;
+
+                                if (namelen == 0)
+                                        /*
+                                         * Skip dummy record.
+                                         */
+                                        continue;
+
+                                fid  = ent->lde_fid;
+                                name = ent->lde_name;
+                                fid_le_to_cpu(&fid, &fid);
+                                ino  = ll_fid_build_ino(sbi, &fid);
+                                type = ll_dirent_type_get(ent);
+                                done = filldir(cookie, name, namelen,
+                                               (loff_t)hash, ino, type);
+                        }
+                        next = le64_to_cpu(dp->ldp_hash_end);
+                        ll_put_page(page);
+                        if (!done) {
+                                pos = next;
+                                if (pos == DIR_END_OFF)
+                                        /*
+                                         * End of directory reached.
+                                         */
+                                        done = 1;
+                                else if (1 /* chain is exhausted*/)
+                                        /*
+                                         * Normal case: continue to the next
+                                         * page.
+                                         */
+                                        page = ll_get_dir_page(inode, pos, 1,
+                                                               &chain);
+                                else {
+                                        /*
+                                         * go into overflow page.
+                                         */
+                                }
+                        } else
+                                pos = hash;
+                } else {
+                        rc = PTR_ERR(page);
+                        CERROR("error reading dir "DFID" at %lu: rc %d\n",
+                               PFID(&info->lli_fid), (unsigned long)pos, rc);
+                }
+        }
+
+        filp->f_pos = (loff_t)pos;
+        filp->f_version = inode->i_version;
+        touch_atime(filp->f_vfsmnt, filp->f_dentry);
 
+        ll_dir_chain_fini(&chain);
 
-int ll_readdir(struct file * filp, void * dirent, filldir_t filldir)
+        RETURN(rc);
+}
+
+int ll_send_mgc_param(struct obd_export *mgc, char *string)
 {
-        struct inode *inode = filp->f_dentry->d_inode;
-        loff_t pos = filp->f_pos;
-        // XXX struct super_block *sb = inode->i_sb;
-        unsigned offset = pos & ~PAGE_CACHE_MASK;
-        unsigned long n = pos >> PAGE_CACHE_SHIFT;
-        unsigned long npages = dir_pages(inode);
-        unsigned chunk_mask = ~(ext2_chunk_size(inode)-1);
-        unsigned char *types = ext2_filetype_table;
-        int need_revalidate = (filp->f_version != inode->i_version);
+        struct mgs_send_param *msp;
         int rc = 0;
-        ENTRY;
 
-        CDEBUG(D_VFSTRACE, "VFS Op:inode=%lu/%u(%p) pos %llu/%llu\n",
-               inode->i_ino, inode->i_generation, inode, pos, inode->i_size);
+        OBD_ALLOC_PTR(msp);
+        if (!msp)
+                return -ENOMEM;
 
-        if (pos > inode->i_size - EXT2_DIR_REC_LEN(1))
-                RETURN(0);
-
-        for ( ; n < npages; n++, offset = 0) {
-                char *kaddr, *limit;
-                ext2_dirent *de;
-                struct page *page;
+        strncpy(msp->mgs_param, string, MGS_PARAM_MAXLEN);
+        rc = obd_set_info_async(mgc, sizeof(KEY_SET_INFO), KEY_SET_INFO,
+                                sizeof(struct mgs_send_param), msp, NULL);
+        if (rc)
+                CERROR("Failed to set parameter: %d\n", rc);
+        OBD_FREE_PTR(msp);
 
-                CDEBUG(D_EXT2,"read %lu of dir %lu/%u page %lu/%lu size %llu\n",
-                       PAGE_CACHE_SIZE, inode->i_ino, inode->i_generation,
-                       n, npages, inode->i_size);
-                page = ll_get_dir_page(inode, n);
+        return rc;
+}
 
-                /* size might have been updated by md_readpage() */
-                npages = dir_pages(inode);
+char *ll_get_fsname(struct inode *inode)
+{
+        struct lustre_sb_info *lsi = s2lsi(inode->i_sb);
+        char *ptr, *fsname;
+        int len;
+
+        OBD_ALLOC(fsname, MGS_PARAM_MAXLEN);
+        len = strlen(lsi->lsi_lmd->lmd_profile);
+        ptr = strrchr(lsi->lsi_lmd->lmd_profile, '-');
+        if (ptr && (strcmp(ptr, "-client") == 0))
+                len -= 7;
+        strncpy(fsname, lsi->lsi_lmd->lmd_profile, len);
+        fsname[len] = '\0';
+
+        return fsname;
+}
 
-                if (IS_ERR(page)) {
-                        rc = PTR_ERR(page);
-                        CERROR("error reading dir %lu/%u page %lu: rc %d\n",
-                               inode->i_ino, inode->i_generation, n, rc);
-                        continue;
+int ll_dir_setstripe(struct inode *inode, struct lov_user_md *lump,
+                     int set_default)
+{
+        struct ll_sb_info *sbi = ll_i2sbi(inode);
+        struct md_op_data *op_data;
+        struct ptlrpc_request *req = NULL;
+        int rc = 0;
+        struct lustre_sb_info *lsi = s2lsi(inode->i_sb);
+        struct obd_device *mgc = lsi->lsi_mgc;
+        char *fsname = NULL, *param = NULL;
+        int lum_size;
+
+        /*
+         * This is coming from userspace, so should be in
+         * local endian.  But the MDS would like it in little
+         * endian, so we swab it before we send it.
+         */
+        switch (lump->lmm_magic) {
+        case LOV_USER_MAGIC_V1: {
+                if (lump->lmm_magic != cpu_to_le32(LOV_USER_MAGIC_V1))
+                        lustre_swab_lov_user_md_v1(lump);
+                lum_size = sizeof(struct lov_user_md_v1);
+                break;
                 }
-
-                kaddr = page_address(page);
-                if (need_revalidate) {
-                        offset = ext2_validate_entry(kaddr, offset, chunk_mask);
-                        need_revalidate = 0;
+        case LOV_USER_MAGIC_V3: {
+                if (lump->lmm_magic != cpu_to_le32(LOV_USER_MAGIC_V3))
+                        lustre_swab_lov_user_md_v3((struct lov_user_md_v3 *)lump);
+                lum_size = sizeof(struct lov_user_md_v3);
+                break;
                 }
-                de = (ext2_dirent *)(kaddr+offset);
-                limit = kaddr + PAGE_CACHE_SIZE - EXT2_DIR_REC_LEN(1);
-                for ( ;(char*)de <= limit; de = ext2_next_entry(de)) {
-                        if (de->inode) {
-                                int over;
-                                
-                                rc = 0; /* no error if we return something */
-                                
-                                offset = (char *)de - kaddr;
-                                over = filldir(dirent, de->name, de->name_len,
-                                               (n<<PAGE_CACHE_SHIFT) | offset,
-                                               le32_to_cpu(de->inode),
-                                               types[de->file_type &
-                                                     (EXT2_FT_MAX - 1)]);
-
-                                if (over) {
-                                        ext2_put_page(page);
-                                        GOTO(done, rc);
-                                }
-                        }
+        default: {
+                CDEBUG(D_IOCTL, "bad userland LOV MAGIC:"
+                                " %#08x != %#08x nor %#08x\n",
+                                lump->lmm_magic, LOV_USER_MAGIC_V1,
+                                LOV_USER_MAGIC_V3);
+                RETURN(-EINVAL);
                 }
-                ext2_put_page(page);
         }
 
-done:
-        filp->f_pos = (n << PAGE_CACHE_SHIFT) | offset;
-        filp->f_version = inode->i_version;
-        update_atime(inode);
-        RETURN(rc);
+        op_data = ll_prep_md_op_data(NULL, inode, NULL, NULL, 0, 0,
+                                     LUSTRE_OPC_ANY, NULL);
+        if (IS_ERR(op_data))
+                RETURN(PTR_ERR(op_data));
+
+        /* swabbing is done in lov_setstripe() on server side */
+        rc = md_setattr(sbi->ll_md_exp, op_data, lump, lum_size,
+                        NULL, 0, &req, NULL);
+        ll_finish_md_op_data(op_data);
+        ptlrpc_req_finished(req);
+        if (rc) {
+                if (rc != -EPERM && rc != -EACCES)
+                        CERROR("mdc_setattr fails: rc = %d\n", rc);
+        }
+
+        /* In the following we use the fact that LOV_USER_MAGIC_V1 and
+         LOV_USER_MAGIC_V3 have the same initial fields so we do not
+         need the make the distiction between the 2 versions */
+        if (set_default && mgc->u.cli.cl_mgc_mgsexp) {
+                OBD_ALLOC(param, MGS_PARAM_MAXLEN);
+
+                /* Get fsname and assume devname to be -MDT0000. */
+                fsname = ll_get_fsname(inode);
+                /* Set root stripesize */
+                sprintf(param, "%s-MDT0000.lov.stripesize=%u", fsname,
+                        lump->lmm_stripe_size);
+                rc = ll_send_mgc_param(mgc->u.cli.cl_mgc_mgsexp, param);
+                if (rc)
+                        goto end;
+
+                /* Set root stripecount */
+                sprintf(param, "%s-MDT0000.lov.stripecount=%hd", fsname,
+                        lump->lmm_stripe_count);
+                rc = ll_send_mgc_param(mgc->u.cli.cl_mgc_mgsexp, param);
+                if (rc)
+                        goto end;
+
+                /* Set root stripeoffset */
+                sprintf(param, "%s-MDT0000.lov.stripeoffset=%hd", fsname,
+                        lump->lmm_stripe_offset);
+                rc = ll_send_mgc_param(mgc->u.cli.cl_mgc_mgsexp, param);
+                if (rc)
+                        goto end;
+end:
+                if (fsname)
+                        OBD_FREE(fsname, MGS_PARAM_MAXLEN);
+                if (param)
+                        OBD_FREE(param, MGS_PARAM_MAXLEN);
+        }
+        return rc;
 }
 
-static int ll_mkdir_stripe(struct inode *inode, unsigned long arg)
+int ll_dir_getstripe(struct inode *inode, struct lov_mds_md **lmmp,
+                     int *lmm_size, struct ptlrpc_request **request)
 {
-        char *name;
-        struct ll_user_mkdir_stripe lums;
-        struct ptlrpc_request *request = NULL;
         struct ll_sb_info *sbi = ll_i2sbi(inode);
-        struct mdc_op_data op_data;
-        u16 nstripes;
-        mode_t mode;
-        int err = 0;
-        ENTRY;
+        struct mdt_body   *body;
+        struct lov_mds_md *lmm = NULL;
+        struct ptlrpc_request *req = NULL;
+        int rc, lmmsize;
+        struct obd_capa *oc;
+
+        rc = ll_get_max_mdsize(sbi, &lmmsize);
+        if (rc)
+                RETURN(rc);
 
-        if (copy_from_user(&lums, (void *)arg, sizeof(lums)))
-                RETURN(-EFAULT);
+        oc = ll_mdscapa_get(inode);
+        rc = md_getattr(sbi->ll_md_exp, ll_inode2fid(inode),
+                        oc, OBD_MD_FLEASIZE | OBD_MD_FLDIREA,
+                        lmmsize, &req);
+        capa_put(oc);
+        if (rc < 0) {
+                CDEBUG(D_INFO, "md_getattr failed on inode "
+                       "%lu/%u: rc %d\n", inode->i_ino,
+                       inode->i_generation, rc);
+                GOTO(out, rc);
+        }
 
-        if (lums.lums_namelen <= 0)
-                RETURN(-EINVAL);
-        OBD_ALLOC(name, lums.lums_namelen);
-        if (!name)
-                RETURN(-ENOMEM);
-
-        if (copy_from_user(name, lums.lums_name, lums.lums_namelen))
-                GOTO(out, err=-EFAULT);
-
-        CDEBUG(D_VFSTRACE, "ioctl Op:name=%s,dir=%lu/%u(%p)\n",
-               name, inode->i_ino, inode->i_generation, inode);
-        nstripes = lums.lums_nstripes;
-
-        mode = lums.lums_mode;
-        mode = (mode & (S_IRWXUGO|S_ISVTX) & ~current->fs->umask) | S_IFDIR;
-        ll_prepare_mdc_op_data(&op_data, inode, NULL, name,lums.lums_namelen,0);
-        err = md_create(sbi->ll_mdc_exp, &op_data, &nstripes, sizeof(nstripes),
-                        mode, current->fsuid, current->fsgid, 0, &request);
-        ptlrpc_req_finished(request);
+        body = req_capsule_server_get(&req->rq_pill, &RMF_MDT_BODY);
+        LASSERT(body != NULL);
+
+        lmmsize = body->eadatasize;
 
+        if (!(body->valid & (OBD_MD_FLEASIZE | OBD_MD_FLDIREA)) ||
+            lmmsize == 0) {
+                GOTO(out, rc = -ENODATA);
+        }
+
+        lmm = req_capsule_server_sized_get(&req->rq_pill,
+                                           &RMF_MDT_MD, lmmsize);
+        LASSERT(lmm != NULL);
+
+        /*
+         * This is coming from the MDS, so is probably in
+         * little endian.  We convert it to host endian before
+         * passing it to userspace.
+         */
+        /* We don't swab objects for directories */
+        switch (le32_to_cpu(lmm->lmm_magic)) {
+        case LOV_MAGIC_V1:
+                if (LOV_MAGIC != cpu_to_le32(LOV_MAGIC))
+                        lustre_swab_lov_user_md_v1((struct lov_user_md_v1 *)lmm);
+                break;
+        case LOV_MAGIC_V3:
+                if (LOV_MAGIC != cpu_to_le32(LOV_MAGIC))
+                        lustre_swab_lov_user_md_v3((struct lov_user_md_v3 *)lmm);
+                break;
+        default:
+                CERROR("unknown magic: %lX\n", (unsigned long)lmm->lmm_magic);
+                rc = -EPROTO;
+        }
 out:
-        OBD_FREE(name, lums.lums_namelen);
-        RETURN(err);
+        *lmmp = lmm;
+        *lmm_size = lmmsize;
+        *request = req;
+        return rc;
 }
 
 static int ll_dir_ioctl(struct inode *inode, struct file *file,
@@ -420,21 +705,30 @@ static int ll_dir_ioctl(struct inode *inode, struct file *file,
         CDEBUG(D_VFSTRACE, "VFS Op:inode=%lu/%u(%p), cmd=%#x\n",
                inode->i_ino, inode->i_generation, inode, cmd);
 
-        if (_IOC_TYPE(cmd) == 'T') /* tty ioctls */
+        /* asm-ppc{,64} declares TCGETS, et. al. as type 't' not 'T' */
+        if (_IOC_TYPE(cmd) == 'T' || _IOC_TYPE(cmd) == 't') /* tty ioctls */
                 return -ENOTTY;
 
-        lprocfs_counter_incr(ll_i2sbi(inode)->ll_stats, LPROC_LL_IOCTL);
+        ll_stats_ops_tally(ll_i2sbi(inode), LPROC_LL_IOCTL, 1);
         switch(cmd) {
         case EXT3_IOC_GETFLAGS:
         case EXT3_IOC_SETFLAGS:
                 RETURN(ll_iocontrol(inode, file, cmd, arg));
+        case EXT3_IOC_GETVERSION_OLD:
+        case EXT3_IOC_GETVERSION:
+                RETURN(put_user(inode->i_generation, (int *)arg));
+        /* We need to special case any other ioctls we want to handle,
+         * to send them to the MDS/OST as appropriate and to properly
+         * network encode the arg field.
+        case EXT3_IOC_SETVERSION_OLD:
+        case EXT3_IOC_SETVERSION:
+        */
         case IOC_MDC_LOOKUP: {
                 struct ptlrpc_request *request = NULL;
-                struct ll_fid fid;
+                int namelen, rc, len = 0;
                 char *buf = NULL;
                 char *filename;
-                int namelen, rc, len = 0;
-                unsigned long valid;
+                struct obd_capa *oc;
 
                 rc = obd_ioctl_getdata(&buf, &len, (void *)arg);
                 if (rc)
@@ -449,10 +743,11 @@ static int ll_dir_ioctl(struct inode *inode, struct file *file,
                         GOTO(out, rc = -EINVAL);
                 }
 
-                valid = OBD_MD_FLID;
-                ll_inode2fid(&fid, inode);
-                rc = md_getattr_name(sbi->ll_mdc_exp, &fid,
-                                     filename, namelen, valid, 0, &request);
+                oc = ll_mdscapa_get(inode);
+                rc = md_getattr_name(sbi->ll_md_exp, ll_inode2fid(inode), oc,
+                                     filename, namelen, OBD_MD_FLID, 0,
+                                     ll_i2suppgid(inode), &request);
+                capa_put(oc);
                 if (rc < 0) {
                         CDEBUG(D_INFO, "md_getattr_name: %d\n", rc);
                         GOTO(out, rc);
@@ -465,220 +760,488 @@ static int ll_dir_ioctl(struct inode *inode, struct file *file,
                 obd_ioctl_freedata(buf, len);
                 return rc;
         }
-        case LL_IOC_MDC_MKDIRSTRIPE:
-                RETURN(ll_mkdir_stripe(inode, arg));
-        case IOC_MDC_FINISH_GNS:
-                RETURN(ll_finish_gns(sbi));
         case LL_IOC_LOV_SETSTRIPE: {
-                struct ptlrpc_request *request = NULL;
-                struct mdc_op_data op_data;
-                struct iattr attr = { 0 };
-                struct lov_user_md lum, *lump = (struct lov_user_md *)arg;
-                int rc = 0;
-
-                ll_prepare_mdc_op_data(&op_data, inode, NULL, NULL, 0, 0);
+                struct lov_user_md_v3 lumv3;
+                struct lov_user_md_v1 *lumv1 = (struct lov_user_md_v1 *)&lumv3;
+                struct lov_user_md_v1 *lumv1p = (struct lov_user_md_v1 *)arg;
+                struct lov_user_md_v3 *lumv3p = (struct lov_user_md_v3 *)arg;
 
-                LASSERT(sizeof(lum) == sizeof(*lump));
-                LASSERT(sizeof(lum.lmm_objects[0]) ==
-                        sizeof(lump->lmm_objects[0]));
-                rc = copy_from_user(&lum, lump, sizeof(lum));
-                if (rc)
-                        return(-EFAULT);
+                int rc = 0;
+                int set_default = 0;
+
+                LASSERT(sizeof(lumv3) == sizeof(*lumv3p));
+                LASSERT(sizeof(lumv3.lmm_objects[0]) ==
+                        sizeof(lumv3p->lmm_objects[0]));
+                /* first try with v1 which is smaller than v3 */
+                if (copy_from_user(lumv1, lumv1p, sizeof(*lumv1)))
+                        RETURN(-EFAULT);
+
+                if (lumv1->lmm_magic == LOV_USER_MAGIC_V3) {
+                        if (copy_from_user(&lumv3, lumv3p, sizeof(lumv3)))
+                                RETURN(-EFAULT);
+                }
 
-                if (lum.lmm_magic != LOV_USER_MAGIC)
-                        RETURN(-EINVAL);
+                if (inode->i_sb->s_root == file->f_dentry)
+                        set_default = 1;
 
-                rc = md_setattr(sbi->ll_mdc_exp, &op_data,
-                                &attr, &lum, sizeof(lum), NULL, 0, &request);
-                if (rc) {
-                        ptlrpc_req_finished(request);
-                        if (rc != -EPERM && rc != -EACCES)
-                                CERROR("md_setattr fails: rc = %d\n", rc);
-                        return rc;
-                }
-                ptlrpc_req_finished(request);
+                /* in v1 and v3 cases lumv1 points to data */
+                rc = ll_dir_setstripe(inode, lumv1, set_default);
 
-                return rc;
+                RETURN(rc);
         }
-        case LL_IOC_LOV_GETSTRIPE: {
+        case LL_IOC_OBD_STATFS:
+                RETURN(ll_obd_statfs(inode, (void *)arg));
+        case LL_IOC_LOV_GETSTRIPE:
+        case LL_IOC_MDC_GETINFO:
+        case IOC_MDC_GETFILEINFO:
+        case IOC_MDC_GETFILESTRIPE: {
                 struct ptlrpc_request *request = NULL;
-                struct lov_user_md *lump = (struct lov_user_md *)arg;
-                struct lov_mds_md *lmm;
-                struct ll_fid fid;
-                struct mds_body *body;
-                unsigned long valid = 0;
+                struct lov_user_md *lump;
+                struct lov_mds_md *lmm = NULL;
+                struct mdt_body *body;
+                char *filename = NULL;
                 int rc, lmmsize;
 
-                valid |= OBD_MD_FLDIREA;
+                if (cmd == IOC_MDC_GETFILEINFO ||
+                    cmd == IOC_MDC_GETFILESTRIPE) {
+                        filename = getname((const char *)arg);
+                        if (IS_ERR(filename))
+                                RETURN(PTR_ERR(filename));
 
-                ll_inode2fid(&fid, inode);
-                rc = md_getattr(sbi->ll_mdc_exp, &fid, valid,
-                                obd_size_diskmd(sbi->ll_osc_exp, NULL),
-                                &request);
-                if (rc < 0) {
-                        CDEBUG(D_INFO, "md_getattr failed: rc = %d\n", rc);
-                        RETURN(rc);
+                        rc = ll_lov_getstripe_ea_info(inode, filename, &lmm,
+                                                      &lmmsize, &request);
+                } else {
+                        rc = ll_dir_getstripe(inode, &lmm, &lmmsize, &request);
                 }
 
-                body = lustre_msg_buf(request->rq_repmsg, 0, sizeof(*body));
-                LASSERT(body != NULL);         /* checked by md_getattr_name */
-                LASSERT_REPSWABBED(request, 0);/* swabbed by md_getattr_name */
+                if (request) {
+                        body = req_capsule_server_get(&request->rq_pill,
+                                                      &RMF_MDT_BODY);
+                        LASSERT(body != NULL);
+                } else {
+                        GOTO(out_req, rc);
+                }
 
-                lmmsize = body->eadatasize;
-                if (lmmsize == 0)
-                        GOTO(out_get, rc = -ENODATA);
+                if (rc < 0) {
+                        if (rc == -ENODATA && (cmd == IOC_MDC_GETFILEINFO ||
+                                               cmd == LL_IOC_MDC_GETINFO))
+                                GOTO(skip_lmm, rc = 0);
+                        else
+                                GOTO(out_req, rc);
+                }
 
-                lmm = lustre_msg_buf(request->rq_repmsg, 1, lmmsize);
-                LASSERT(lmm != NULL);
-                LASSERT_REPSWABBED(request, 1);
-                rc = copy_to_user(lump, lmm, lmmsize);
-                if (rc)
-                        GOTO(out_get, rc = -EFAULT);
+                if (cmd == IOC_MDC_GETFILESTRIPE ||
+                    cmd == LL_IOC_LOV_GETSTRIPE) {
+                        lump = (struct lov_user_md *)arg;
+                } else {
+                        struct lov_user_mds_data *lmdp;
+                        lmdp = (struct lov_user_mds_data *)arg;
+                        lump = &lmdp->lmd_lmm;
+                }
+                if (copy_to_user(lump, lmm, lmmsize))
+                        GOTO(out_lmm, rc = -EFAULT);
+        skip_lmm:
+                if (cmd == IOC_MDC_GETFILEINFO || cmd == LL_IOC_MDC_GETINFO) {
+                        struct lov_user_mds_data *lmdp;
+                        lstat_t st = { 0 };
+
+                        st.st_dev     = inode->i_sb->s_dev;
+                        st.st_mode    = body->mode;
+                        st.st_nlink   = body->nlink;
+                        st.st_uid     = body->uid;
+                        st.st_gid     = body->gid;
+                        st.st_rdev    = body->rdev;
+                        st.st_size    = body->size;
+                        st.st_blksize = CFS_PAGE_SIZE;
+                        st.st_blocks  = body->blocks;
+                        st.st_atime   = body->atime;
+                        st.st_mtime   = body->mtime;
+                        st.st_ctime   = body->ctime;
+                        st.st_ino     = inode->i_ino;
+
+                        lmdp = (struct lov_user_mds_data *)arg;
+                        if (copy_to_user(&lmdp->lmd_st, &st, sizeof(st)))
+                                GOTO(out_lmm, rc = -EFAULT);
+                }
 
                 EXIT;
-        out_get:
+        out_lmm:
+                if (lmm && lmm->lmm_magic == LOV_MAGIC_JOIN)
+                        OBD_FREE(lmm, lmmsize);
+        out_req:
                 ptlrpc_req_finished(request);
-                RETURN(rc);
+                if (filename)
+                        putname(filename);
+                return rc;
         }
-        case IOC_MDC_GETSTRIPE: {
-                struct ptlrpc_request *request = NULL;
-                struct ll_fid fid;
-                struct mds_body *body;
-                struct lov_user_md *lump = (struct lov_user_md *)arg;
+        case IOC_LOV_GETINFO: {
+                struct lov_user_mds_data *lumd;
+                struct lov_stripe_md *lsm;
+                struct lov_user_md *lum;
                 struct lov_mds_md *lmm;
-                char *filename;
-                int rc, lmmsize;
-
-                filename = getname((const char *)arg);
-                if (IS_ERR(filename))
-                        RETURN(PTR_ERR(filename));
+                int lmmsize;
+                lstat_t st;
+                int rc;
 
-                ll_inode2fid(&fid, inode);
-                rc = md_getattr_name(sbi->ll_mdc_exp, &fid, filename,
-                                     strlen(filename) + 1, OBD_MD_FLEASIZE,
-                                     obd_size_diskmd(sbi->ll_osc_exp, NULL),
-                                     &request);
-                if (rc < 0) {
-                        CDEBUG(D_INFO, "md_getattr_name failed on %s: rc %d\n",
-                               filename, rc);
-                        GOTO(out_name, rc);
-                }
+                lumd = (struct lov_user_mds_data *)arg;
+                lum = &lumd->lmd_lmm;
 
-                body = lustre_msg_buf(request->rq_repmsg, 0, sizeof (*body));
-                LASSERT(body != NULL);         /* checked by md_getattr_name */
-                LASSERT_REPSWABBED(request, 0);/* swabbed by md_getattr_name */
+                rc = ll_get_max_mdsize(sbi, &lmmsize);
+                if (rc)
+                        RETURN(rc);
 
-                lmmsize = body->eadatasize;
+                OBD_ALLOC(lmm, lmmsize);
+                if (copy_from_user(lmm, lum, lmmsize))
+                        GOTO(free_lmm, rc = -EFAULT);
+
+                switch (lmm->lmm_magic) {
+                case LOV_USER_MAGIC_V1:
+                        if (LOV_USER_MAGIC_V1 == cpu_to_le32(LOV_USER_MAGIC_V1))
+                                break;
+                        /* swab objects first so that stripes num will be sane */
+                        lustre_swab_lov_user_md_objects(
+                                ((struct lov_user_md_v1 *)lmm)->lmm_objects,
+                                ((struct lov_user_md_v1 *)lmm)->lmm_stripe_count);
+                        lustre_swab_lov_user_md_v1((struct lov_user_md_v1 *)lmm);
+                        break;
+                case LOV_USER_MAGIC_V3:
+                        if (LOV_USER_MAGIC_V3 == cpu_to_le32(LOV_USER_MAGIC_V3))
+                                break;
+                        /* swab objects first so that stripes num will be sane */
+                        lustre_swab_lov_user_md_objects(
+                                ((struct lov_user_md_v3 *)lmm)->lmm_objects,
+                                ((struct lov_user_md_v3 *)lmm)->lmm_stripe_count);
+                        lustre_swab_lov_user_md_v3((struct lov_user_md_v3 *)lmm);
+                        break;
+                default:
+                        GOTO(free_lmm, rc = -EINVAL);
+                }
 
-                if (!(body->valid & OBD_MD_FLEASIZE) || lmmsize == 0)
-                        GOTO(out_req, rc = -ENODATA);
+                rc = obd_unpackmd(sbi->ll_dt_exp, &lsm, lmm, lmmsize);
+                if (rc < 0)
+                        GOTO(free_lmm, rc = -ENOMEM);
 
-                if (lmmsize > 4096)
-                        GOTO(out_req, rc = -EFBIG);
+                rc = obd_checkmd(sbi->ll_dt_exp, sbi->ll_md_exp, lsm);
+                if (rc)
+                        GOTO(free_lsm, rc);
 
-                lmm = lustre_msg_buf(request->rq_repmsg, 1, lmmsize);
-                LASSERT(lmm != NULL);
-                LASSERT_REPSWABBED(request, 1);
+                /* Perform glimpse_size operation. */
+                memset(&st, 0, sizeof(st));
 
-                rc = copy_to_user(lump, lmm, lmmsize);
+                rc = ll_glimpse_ioctl(sbi, lsm, &st);
                 if (rc)
-                        GOTO(out_req, rc = -EFAULT);
+                        GOTO(free_lsm, rc);
+
+                if (copy_to_user(&lumd->lmd_st, &st, sizeof(st)))
+                        GOTO(free_lsm, rc = -EFAULT);
 
                 EXIT;
-        out_req:
-                ptlrpc_req_finished(request);
-        out_name:
-                putname(filename);
+        free_lsm:
+                obd_free_memmd(sbi->ll_dt_exp, &lsm);
+        free_lmm:
+                OBD_FREE(lmm, lmmsize);
                 return rc;
         }
-        case OBD_IOC_PING: {
+        case OBD_IOC_LLOG_CATINFO: {
                 struct ptlrpc_request *req = NULL;
-                char *buf = NULL;
-                int rc, len=0;
-                struct client_obd *cli;
-                struct obd_device *obd;
+                char                  *buf = NULL;
+                char                  *str;
+                int                    len = 0;
+                int                    rc;
 
                 rc = obd_ioctl_getdata(&buf, &len, (void *)arg);
                 if (rc)
                         RETURN(rc);
                 data = (void *)buf;
 
-                obd = class_name2obd(data->ioc_inlbuf1);
+                if (!data->ioc_inlbuf1) {
+                        obd_ioctl_freedata(buf, len);
+                        RETURN(-EINVAL);
+                }
 
-                if (!obd )
-                        GOTO(out_ping, rc = -ENODEV);
+                req = ptlrpc_request_alloc(sbi2mdc(sbi)->cl_import,
+                                           &RQF_LLOG_CATINFO);
+                if (req == NULL)
+                        GOTO(out_catinfo, rc = -ENOMEM);
 
-                if (!obd->obd_attached) {
-                        CERROR("Device %d not attached\n", obd->obd_minor);
-                        GOTO(out_ping, rc = -ENODEV);
+                req_capsule_set_size(&req->rq_pill, &RMF_NAME, RCL_CLIENT,
+                                     data->ioc_inllen1);
+                req_capsule_set_size(&req->rq_pill, &RMF_STRING, RCL_CLIENT,
+                                     data->ioc_inllen2);
+
+                rc = ptlrpc_request_pack(req, LUSTRE_LOG_VERSION, LLOG_CATINFO);
+                if (rc) {
+                        ptlrpc_request_free(req);
+                        GOTO(out_catinfo, rc);
                 }
-                if (!obd->obd_set_up) {
-                        CERROR("Device %d still not setup\n", obd->obd_minor);
-                        GOTO(out_ping, rc = -ENODEV);
+
+                str = req_capsule_client_get(&req->rq_pill, &RMF_NAME);
+                memcpy(str, data->ioc_inlbuf1, data->ioc_inllen1);
+                if (data->ioc_inllen2) {
+                        str = req_capsule_client_get(&req->rq_pill,
+                                                     &RMF_STRING);
+                        memcpy(str, data->ioc_inlbuf2, data->ioc_inllen2);
                 }
-                cli = &obd->u.cli;
-                req = ptlrpc_prep_req(cli->cl_import, LUSTRE_OBD_VERSION,
-                                      OBD_PING, 0, NULL, NULL);
-                if (!req)
-                        GOTO(out_ping, rc = -ENOMEM);
 
-                req->rq_replen = lustre_msg_size(0, NULL);
-                req->rq_send_state = LUSTRE_IMP_FULL;
+                req_capsule_set_size(&req->rq_pill, &RMF_STRING, RCL_SERVER,
+                                     data->ioc_plen1);
+                ptlrpc_request_set_replen(req);
 
                 rc = ptlrpc_queue_wait(req);
-
+                if (!rc) {
+                        str = req_capsule_server_get(&req->rq_pill,
+                                                     &RMF_STRING);
+                        if (copy_to_user(data->ioc_pbuf1, str, data->ioc_plen1))
+                                rc = -EFAULT;
+                }
                 ptlrpc_req_finished(req);
-        out_ping:
+        out_catinfo:
                 obd_ioctl_freedata(buf, len);
-                return rc;
+                RETURN(rc);
         }
-        case OBD_IOC_LLOG_CATINFO: {
-                struct ptlrpc_request *req = NULL;
-                char *buf = NULL;
-                int rc, len = 0;
-                char *bufs[2], *str;
-                int lens[2], size;
+        case OBD_IOC_QUOTACHECK: {
+                struct obd_quotactl *oqctl;
+                int rc, error = 0;
+
+                if (!cfs_capable(CFS_CAP_SYS_ADMIN) ||
+                    sbi->ll_flags & LL_SBI_RMT_CLIENT)
+                        RETURN(-EPERM);
+
+                OBD_ALLOC_PTR(oqctl);
+                if (!oqctl)
+                        RETURN(-ENOMEM);
+                oqctl->qc_type = arg;
+                rc = obd_quotacheck(sbi->ll_md_exp, oqctl);
+                if (rc < 0) {
+                        CDEBUG(D_INFO, "md_quotacheck failed: rc %d\n", rc);
+                        error = rc;
+                }
 
-                rc = obd_ioctl_getdata(&buf, &len, (void *)arg);
-                if (rc)
-                        RETURN(rc);
-                data = (void *)buf;
+                rc = obd_quotacheck(sbi->ll_dt_exp, oqctl);
+                if (rc < 0)
+                        CDEBUG(D_INFO, "obd_quotacheck failed: rc %d\n", rc);
 
-                if (!data->ioc_inlbuf1) {
-                        obd_ioctl_freedata(buf, len);
-                        RETURN(-EINVAL);
+                OBD_FREE_PTR(oqctl);
+                return error ?: rc;
+        }
+        case OBD_IOC_POLL_QUOTACHECK: {
+                struct if_quotacheck *check;
+                int rc;
+
+                if (!cfs_capable(CFS_CAP_SYS_ADMIN) ||
+                    sbi->ll_flags & LL_SBI_RMT_CLIENT)
+                        RETURN(-EPERM);
+
+                OBD_ALLOC_PTR(check);
+                if (!check)
+                        RETURN(-ENOMEM);
+
+                rc = obd_iocontrol(cmd, sbi->ll_md_exp, 0, (void *)check,
+                                   NULL);
+                if (rc) {
+                        CDEBUG(D_QUOTA, "mdc ioctl %d failed: %d\n", cmd, rc);
+                        if (copy_to_user((void *)arg, check, sizeof(*check)))
+                                rc = -EFAULT;
+                        GOTO(out_poll, rc);
                 }
 
-                lens[0] = data->ioc_inllen1;
-                bufs[0] = data->ioc_inlbuf1;
-                if (data->ioc_inllen2) {
-                        lens[1] = data->ioc_inllen2;
-                        bufs[1] = data->ioc_inlbuf2;
+                rc = obd_iocontrol(cmd, sbi->ll_dt_exp, 0, (void *)check,
+                                   NULL);
+                if (rc) {
+                        CDEBUG(D_QUOTA, "osc ioctl %d failed: %d\n", cmd, rc);
+                        if (copy_to_user((void *)arg, check, sizeof(*check)))
+                                rc = -EFAULT;
+                        GOTO(out_poll, rc);
+                }
+        out_poll:
+                OBD_FREE_PTR(check);
+                RETURN(rc);
+        }
+        case OBD_IOC_QUOTACTL: {
+                struct if_quotactl *qctl;
+                int cmd, type, id, valid, rc = 0;
+
+                OBD_ALLOC_PTR(qctl);
+                if (!qctl)
+                        RETURN(-ENOMEM);
+
+                if (copy_from_user(qctl, (void *)arg, sizeof(*qctl)))
+                        GOTO(out_quotactl, rc = -EFAULT);
+
+                cmd = qctl->qc_cmd;
+                type = qctl->qc_type;
+                id = qctl->qc_id;
+                valid = qctl->qc_valid;
+
+                switch (cmd) {
+                case LUSTRE_Q_INVALIDATE:
+                case LUSTRE_Q_FINVALIDATE:
+                case Q_QUOTAON:
+                case Q_QUOTAOFF:
+                case Q_SETQUOTA:
+                case Q_SETINFO:
+                        if (!cfs_capable(CFS_CAP_SYS_ADMIN) ||
+                            sbi->ll_flags & LL_SBI_RMT_CLIENT)
+                                GOTO(out_quotactl, rc = -EPERM);
+                        break;
+                case Q_GETQUOTA:
+                        if (((type == USRQUOTA && current->euid != id) ||
+                             (type == GRPQUOTA && !in_egroup_p(id))) &&
+                            (!cfs_capable(CFS_CAP_SYS_ADMIN) ||
+                             sbi->ll_flags & LL_SBI_RMT_CLIENT))
+                                GOTO(out_quotactl, rc = -EPERM);
+                        break;
+                case Q_GETINFO:
+                        break;
+                default:
+                        CERROR("unsupported quotactl op: %#x\n", cmd);
+                        GOTO(out_quotactl, rc = -ENOTTY);
+                }
+
+                if (valid != QC_GENERAL) {
+                        if (sbi->ll_flags & LL_SBI_RMT_CLIENT)
+                                GOTO(out_quotactl, rc = -EOPNOTSUPP);
+
+                        if (cmd == Q_GETINFO)
+                                qctl->qc_cmd = Q_GETOINFO;
+                        else if (cmd == Q_GETQUOTA)
+                                qctl->qc_cmd = Q_GETOQUOTA;
+                        else
+                                GOTO(out_quotactl, rc = -EINVAL);
+
+                        switch (valid) {
+                        case QC_MDTIDX:
+                                rc = obd_iocontrol(OBD_IOC_QUOTACTL,
+                                                   sbi->ll_md_exp,
+                                                   sizeof(*qctl), qctl, NULL);
+                                break;
+                        case QC_OSTIDX:
+                                rc = obd_iocontrol(OBD_IOC_QUOTACTL,
+                                                   sbi->ll_dt_exp,
+                                                   sizeof(*qctl), qctl, NULL);
+                                break;
+                        case QC_UUID:
+                                rc = obd_iocontrol(OBD_IOC_QUOTACTL,
+                                                   sbi->ll_md_exp,
+                                                   sizeof(*qctl), qctl, NULL);
+                                if (rc == -EAGAIN)
+                                        rc = obd_iocontrol(OBD_IOC_QUOTACTL,
+                                                           sbi->ll_dt_exp,
+                                                           sizeof(*qctl), qctl,
+                                                           NULL);
+                                break;
+                        default:
+                                rc = -EINVAL;
+                                break;
+                        }
+
+                        if (rc)
+                                GOTO(out_quotactl, rc);
+                        else
+                                qctl->qc_cmd = cmd;
                 } else {
-                        lens[1] = 0;
-                        bufs[1] = NULL;
+                        struct obd_quotactl *oqctl;
+
+                        OBD_ALLOC_PTR(oqctl);
+                        if (!oqctl)
+                                GOTO(out_quotactl, rc = -ENOMEM);
+
+                        QCTL_COPY(oqctl, qctl);
+                        rc = obd_quotactl(sbi->ll_md_exp, oqctl);
+                        if (rc) {
+                                if (rc != -EALREADY && cmd == Q_QUOTAON) {
+                                        oqctl->qc_cmd = Q_QUOTAOFF;
+                                        obd_quotactl(sbi->ll_md_exp, oqctl);
+                                }
+                                OBD_FREE_PTR(oqctl);
+                                GOTO(out_quotactl, rc);
+                        } else {
+                                QCTL_COPY(qctl, oqctl);
+                                OBD_FREE_PTR(oqctl);
+                        }
                 }
-                size = data->ioc_plen1;
-                req = ptlrpc_prep_req(sbi2mdc(sbi)->cl_import,
-                                      LUSTRE_LOG_VERSION, LLOG_CATINFO,
-                                      2, lens, bufs);
-                if (!req)
-                        GOTO(out_catinfo, rc = -ENOMEM);
 
-                req->rq_replen = lustre_msg_size(1, &size);
+                if (copy_to_user((void *)arg, qctl, sizeof(*qctl)))
+                        rc = -EFAULT;
 
-                rc = ptlrpc_queue_wait(req);
-                str = lustre_msg_string(req->rq_repmsg, 0, data->ioc_plen1);
+        out_quotactl:
+                OBD_FREE_PTR(qctl);
+                RETURN(rc);
+        }
+        case OBD_IOC_GETNAME: {
+                struct obd_device *obd = class_exp2obd(sbi->ll_dt_exp);
+                if (!obd)
+                        RETURN(-EFAULT);
+                if (copy_to_user((void *)arg, obd->obd_name,
+                                strlen(obd->obd_name) + 1))
+                        RETURN (-EFAULT);
+                RETURN(0);
+        }
+        case LL_IOC_FLUSHCTX:
+                RETURN(ll_flush_ctx(inode));
+#ifdef CONFIG_FS_POSIX_ACL
+        case LL_IOC_RMTACL: {
+            if (sbi->ll_flags & LL_SBI_RMT_CLIENT &&
+                inode == inode->i_sb->s_root->d_inode) {
+                struct ll_file_data *fd = LUSTRE_FPRIVATE(file);
+                int rc;
+
+                LASSERT(fd != NULL);
+                rc = rct_add(&sbi->ll_rct, cfs_curproc_pid(), arg);
                 if (!rc)
-                        rc = copy_to_user(data->ioc_pbuf1, str,
-                                          data->ioc_plen1);
-                ptlrpc_req_finished(req);
-        out_catinfo:
-                obd_ioctl_freedata(buf, len);
+                        fd->fd_flags |= LL_FILE_RMTACL;
+                RETURN(rc);
+            } else
+                RETURN(0);
+        }
+#endif
+        case LL_IOC_GETOBDCOUNT: {
+                int count;
+
+                if (copy_from_user(&count, (int *)arg, sizeof(int)))
+                        RETURN(-EFAULT);
+
+                if (!count) {
+                        /* get ost count */
+                        struct lov_obd *lov = &sbi->ll_dt_exp->exp_obd->u.lov;
+                        count = lov->desc.ld_tgt_count;
+                } else {
+                        /* get mdt count */
+                        struct lmv_obd *lmv = &sbi->ll_md_exp->exp_obd->u.lmv;
+                        count = lmv->desc.ld_tgt_count;
+                }
+
+                if (copy_to_user((int *)arg, &count, sizeof(int)))
+                        RETURN(-EFAULT);
+
+                RETURN(0);
+        }
+        case LL_IOC_PATH2FID:
+                if (copy_to_user((void *)arg, &ll_i2info(inode)->lli_fid,
+                                 sizeof(struct lu_fid)))
+                        RETURN(-EFAULT);
+                RETURN(0);
+        case OBD_IOC_CHANGELOG_CLEAR: {
+                struct ioc_changelog_clear *icc;
+                int rc;
+
+                OBD_ALLOC_PTR(icc);
+                if (icc == NULL)
+                        RETURN(-ENOMEM);
+                if (copy_from_user(icc, (void *)arg, sizeof(*icc)))
+                        GOTO(icc_free, rc = -EFAULT);
+
+                rc = obd_iocontrol(cmd, sbi->ll_md_exp, sizeof(*icc), icc,NULL);
+
+icc_free:
+                OBD_FREE_PTR(icc);
                 RETURN(rc);
         }
+        case OBD_IOC_FID2PATH:
+                RETURN(ll_fid2path(ll_i2mdexp(inode), (void *)arg));
+
         default:
-                return obd_iocontrol(cmd, sbi->ll_osc_exp,0,NULL,(void *)arg);
+                RETURN(obd_iocontrol(cmd, sbi->ll_dt_exp,0,NULL,(void *)arg));
         }
 }
 
@@ -701,4 +1264,3 @@ struct file_operations ll_dir_operations = {
         .readdir  = ll_readdir,
         .ioctl    = ll_dir_ioctl
 };
-