Whamcloud - gitweb
merge b_devel into HEAD. Includes:
[fs/lustre-release.git] / lustre / llite / super25.c
index 83867eb..f296d10 100644 (file)
@@ -3,10 +3,22 @@
  *
  * Lustre Light Super operations
  *
- * This code is issued under the GNU General Public License.
- * See the file COPYING in this distribution
+ *  Copyright (c) 2002, 2003 Cluster File Systems, Inc.
  *
- * Copryright (C) 2002 Cluster File Systems, Inc.
+ *   This file is part of Lustre, http://www.lustre.org.
+ *
+ *   Lustre is free software; you can redistribute it and/or
+ *   modify it under the terms of version 2 of the GNU General Public
+ *   License as published by the Free Software Foundation.
+ *
+ *   Lustre 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 for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with Lustre; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #define DEBUG_SUBSYSTEM S_LLITE
 #include <linux/version.h>
 #include <linux/lustre_lite.h>
 #include <linux/lustre_ha.h>
-#include <linux/obd_lov.h>
 #include <linux/lustre_dlm.h>
 #include <linux/init.h>
 #include <linux/fs.h>
+#include <linux/lprocfs_status.h>
 
 #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
+#include <asm/statfs.h>
 kmem_cache_t *ll_file_data_slab;
 extern struct address_space_operations ll_aops;
 extern struct address_space_operations ll_dir_aops;
 struct super_operations ll_super_operations;
 
+/* /proc/lustre/llite root that tracks llite mount points */
+struct proc_dir_entry *proc_lustre_fs_root = NULL;
+/* lproc_llite.c */
+extern int lprocfs_register_mountpoint(struct proc_dir_entry *parent,
+                                       struct super_block *sb,
+                                       char *osc, char *mdc);
+
 extern int ll_init_inodecache(void);
 extern void ll_destroy_inodecache(void);
 extern int ll_recover(struct recovd_data *, int);
@@ -34,6 +54,8 @@ extern int ll_commitcbd_setup(struct ll_sb_info *);
 extern int ll_commitcbd_cleanup(struct ll_sb_info *);
 int ll_read_inode2(struct inode *inode, void *opaque);
 
+extern int ll_proc_namespace(struct super_block* sb, char* osc, char* mdc);
+
 static char *ll_read_opt(const char *opt, char *data)
 {
         char *value;
@@ -41,14 +63,14 @@ static char *ll_read_opt(const char *opt, char *data)
         ENTRY;
 
         CDEBUG(D_SUPER, "option: %s, data %s\n", opt, data);
-        if ( strncmp(opt, data, strlen(opt)) )
+        if (strncmp(opt, data, strlen(opt)))
                 RETURN(NULL);
-        if ( (value = strchr(data, '=')) == NULL )
+        if ((value = strchr(data, '=')) == NULL)
                 RETURN(NULL);
 
         value++;
         OBD_ALLOC(retval, strlen(value) + 1);
-        if ( !retval ) {
+        if (!retval) {
                 CERROR("out of memory!\n");
                 RETURN(NULL);
         }
@@ -63,7 +85,7 @@ static int ll_set_opt(const char *opt, char *data, int fl)
         ENTRY;
 
         CDEBUG(D_SUPER, "option: %s, data %s\n", opt, data);
-        if ( strncmp(opt, data, strlen(opt)) )
+        if (strncmp(opt, data, strlen(opt)))
                 RETURN(0);
         else
                 RETURN(fl);
@@ -82,10 +104,11 @@ static void ll_options(char *options, char **ost, char **mds, int *flags)
 
         while ((this_char = strsep (&opt_ptr, ",")) != NULL) {
                 CDEBUG(D_SUPER, "this_char %s\n", this_char);
-                if ( (!*ost && (*ost = ll_read_opt("osc", this_char)))||
-                     (!*mds && (*mds = ll_read_opt("mdc", this_char)))||
-                     (!(*flags & LL_SBI_NOLCK) && ((*flags) = (*flags) | 
-                      ll_set_opt("nolock", this_char, LL_SBI_NOLCK))) )
+                if ((!*ost && (*ost = ll_read_opt("osc", this_char)))||
+                    (!*mds && (*mds = ll_read_opt("mdc", this_char)))||
+                    (!(*flags & LL_SBI_NOLCK) &&
+                     ((*flags) = (*flags) |
+                      ll_set_opt("nolock", this_char, LL_SBI_NOLCK))))
                         continue;
         }
         EXIT;
@@ -106,26 +129,22 @@ static int ll_fill_super(struct super_block *sb, void *data, int silent)
         int err;
         struct ll_fid rootfid;
         struct obd_statfs osfs;
-        __u64 last_committed;
-        __u64 last_xid;
         struct ptlrpc_request *request = NULL;
         struct ptlrpc_connection *mdc_conn;
         struct ll_read_inode2_cookie lic;
         class_uuid_t uuid;
+        struct obd_uuid param_uuid;
 
         ENTRY;
-        MOD_INC_USE_COUNT;
 
         OBD_ALLOC(sbi, sizeof(*sbi));
-        if (!sbi) {
-                MOD_DEC_USE_COUNT;
+        if (!sbi)
                 RETURN(-ENOMEM);
-        }
 
         INIT_LIST_HEAD(&sbi->ll_conn_chain);
-        sbi->ll_mount_epoch = 0;
+        INIT_LIST_HEAD(&sbi->ll_orphan_dentry_list);
         generate_random_uuid(uuid);
-        class_uuid_unparse(uuid, sbi->ll_sb_uuid);
+        class_uuid_unparse(uuid, &sbi->ll_sb_uuid);
 
         sb->s_fs_info = sbi;
 
@@ -141,22 +160,21 @@ static int ll_fill_super(struct super_block *sb, void *data, int silent)
                 GOTO(out_free, sb = NULL);
         }
 
-        obd = class_uuid2obd(mdc);
+        strncpy(param_uuid.uuid, mdc, sizeof(param_uuid.uuid));
+        obd = class_uuid2obd(&param_uuid);
         if (!obd) {
                 CERROR("MDC %s: not setup or attached\n", mdc);
                 GOTO(out_free, sb = NULL);
         }
 
-        err = obd_connect(&sbi->ll_mdc_conn, obd, sbi->ll_sb_uuid,
+        err = obd_connect(&sbi->ll_mdc_conn, obd, &sbi->ll_sb_uuid,
                           ptlrpc_recovd, ll_recover);
         if (err) {
                 CERROR("cannot connect to %s: rc = %d\n", mdc, err);
                 GOTO(out_free, sb = NULL);
         }
 
-#warning Peter: is this the right place to raise the connection level?
         mdc_conn = sbi2mdc(sbi)->cl_import.imp_connection;
-        mdc_conn->c_level = LUSTRE_CONN_FULL;
         list_add(&mdc_conn->c_sb_chain, &sbi->ll_conn_chain);
 
         obd = class_uuid2obd(osc);
@@ -165,28 +183,23 @@ static int ll_fill_super(struct super_block *sb, void *data, int silent)
                 GOTO(out_mdc, sb = NULL);
         }
 
-        err = obd_connect(&sbi->ll_osc_conn, obd, sbi->ll_sb_uuid,
+        err = obd_connect(&sbi->ll_osc_conn, obd, &sbi->ll_sb_uuid,
                           ptlrpc_recovd, ll_recover);
         if (err) {
                 CERROR("cannot connect to %s: rc = %d\n", osc, err);
                 GOTO(out_mdc, sb = NULL);
         }
 
-        /* XXX: need to store the last_* values somewhere */
-        err = mdc_getstatus(&sbi->ll_mdc_conn, &rootfid, &last_committed,
-                            &last_xid, &request);
-        ptlrpc_req_finished(request);
+        err = mdc_getstatus(&sbi->ll_mdc_conn, &rootfid);
         if (err) {
                 CERROR("cannot mds_connect: rc = %d\n", err);
                 GOTO(out_mdc, sb = NULL);
         }
-        CDEBUG(D_SUPER, "rootfid %Ld\n", (unsigned long long)rootfid.id);
+        CDEBUG(D_SUPER, "rootfid "LPU64"\n", rootfid.id);
         sbi->ll_rootino = rootfid.id;
 
         memset(&osfs, 0, sizeof(osfs));
-        request = NULL;
-        err = mdc_statfs(&sbi->ll_mdc_conn, &osfs, &request);
-        ptlrpc_req_finished(request);
+        err = obd_statfs(&sbi->ll_mdc_conn, &osfs);
         sb->s_blocksize = osfs.os_bsize;
         sb->s_blocksize_bits = log2(osfs.os_bsize);
         sb->s_magic = LL_SUPER_MAGIC;
@@ -195,7 +208,6 @@ static int ll_fill_super(struct super_block *sb, void *data, int silent)
         sb->s_op = &ll_super_operations;
 
         /* make root inode */
-        request = NULL;
         err = mdc_getattr(&sbi->ll_mdc_conn, sbi->ll_rootino, S_IFDIR,
                           OBD_MD_FLNOTOBD|OBD_MD_FLBLOCKS, 0, &request);
         if (err) {
@@ -221,12 +233,21 @@ static int ll_fill_super(struct super_block *sb, void *data, int silent)
 
         if (root) {
                 sb->s_root = d_alloc_root(root);
+                root->i_state &= ~(I_LOCK | I_NEW);
         } else {
                 CERROR("lustre_lite: bad iget4 for root\n");
                 GOTO(out_cdb, sb = NULL);
         }
 
         ptlrpc_req_finished(request);
+        request = NULL;
+
+        if (proc_lustre_fs_root) {
+                err = lprocfs_register_mountpoint(proc_lustre_fs_root, sb,
+                                                  osc, mdc);
+                if (err < 0)
+                        CERROR("could not register mount in /proc/lustre");
+        }
 
 out_dev:
         if (mdc)
@@ -246,52 +267,93 @@ out_mdc:
 out_free:
         OBD_FREE(sbi, sizeof(*sbi));
 
-        MOD_DEC_USE_COUNT;
         goto out_dev;
 } /* ll_fill_super */
 
-struct super_block * ll_get_sb(struct file_system_type *fs_type, 
-                                   int flags, char *devname, void * data)
+struct super_block * ll_get_sb(struct file_system_type *fs_type,
+                               int flags, char *devname, void * data)
 {
-       return get_sb_nodev(fs_type, flags, data, ll_fill_super);
+        return get_sb_nodev(fs_type, flags, data, ll_fill_super);
 }
 
 static void ll_put_super(struct super_block *sb)
 {
         struct ll_sb_info *sbi = ll_s2sbi(sb);
-
+        struct list_head *tmp, *next;
+        struct ll_fid rootfid;
         ENTRY;
+
         list_del(&sbi->ll_conn_chain);
         ll_commitcbd_cleanup(sbi);
         obd_disconnect(&sbi->ll_osc_conn);
+
+        /* NULL request to force sync on the MDS, and get the last_committed
+         * value to flush remaining RPCs from the pending queue on client.
+         *
+         * XXX This should be an mdc_sync() call to sync the whole MDS fs,
+         *     which we can call for other reasons as well.
+         */
+        mdc_getstatus(&sbi->ll_mdc_conn, &rootfid);
+
+        if (sbi->ll_proc_root) {
+                lprocfs_remove(sbi->ll_proc_root);
+        sbi->ll_proc_root = NULL;
+        }
+
         obd_disconnect(&sbi->ll_mdc_conn);
+
+        spin_lock(&dcache_lock);
+        list_for_each_safe(tmp, next, &sbi->ll_orphan_dentry_list){
+                struct dentry *dentry = list_entry(tmp, struct dentry, d_hash);
+                shrink_dcache_parent(dentry);
+        }
+        spin_unlock(&dcache_lock);
+
         OBD_FREE(sbi, sizeof(*sbi));
 
-        MOD_DEC_USE_COUNT;
         EXIT;
 } /* ll_put_super */
 
 static void ll_clear_inode(struct inode *inode)
 {
+        struct ll_sb_info *sbi = ll_i2sbi(inode);
+        struct ll_inode_info *lli = ll_i2info(inode);
+        int rc;
         ENTRY;
 
-        if (atomic_read(&inode->i_count) == 0) {
-                struct ll_inode_info *lli = ll_i2info(inode);
-                struct lov_stripe_md *lsm = lli->lli_smd;
-                char *symlink_name = lli->lli_symlink_name;
+#warning "Is there a reason we don't do this in 2.5, but we do in 2.4?"
+#if 0
+        rc = mdc_cancel_unused(&sbi->ll_mdc_conn, inode, LDLM_FL_NO_CALLBACK);
+        if (rc < 0) {
+                CERROR("mdc_cancel_unused: %d\n", rc);
+                /* XXX FIXME do something dramatic */
+        }
 
-                if (lsm) {
-                        OBD_FREE(lsm, ll_ost_easize(inode->i_sb));
-                        lli->lli_smd = NULL;
-                }
-                if (symlink_name) {
-                        OBD_FREE(symlink_name, strlen(symlink_name) + 1);
-                        lli->lli_symlink_name = NULL;
+        if (lli->lli_smd) {
+                rc = obd_cancel_unused(&sbi->ll_osc_conn, lli->lli_smd, 0);
+                if (rc < 0) {
+                        CERROR("obd_cancel_unused: %d\n", rc);
+                        /* XXX FIXME do something dramatic */
                 }
         }
+#endif
+
+        if (atomic_read(&inode->i_count) != 0)
+                CERROR("clearing in-use inode %lu: count = %d\n",
+                       inode->i_ino, atomic_read(&inode->i_count));
+
+        if (lli->lli_smd)
+                obd_free_memmd(&sbi->ll_osc_conn, &lli->lli_smd);
+
+        if (lli->lli_symlink_name) {
+                OBD_FREE(lli->lli_symlink_name,strlen(lli->lli_symlink_name)+1);
+                lli->lli_symlink_name = NULL;
+        }
+
         EXIT;
 }
 
+#if 0
 static void ll_delete_inode(struct inode *inode)
 {
         ENTRY;
@@ -300,8 +362,9 @@ static void ll_delete_inode(struct inode *inode)
                 struct obdo *oa;
                 struct lov_stripe_md *lsm = ll_i2info(inode)->lli_smd;
 
+                /* mcreate with no open */
                 if (!lsm)
-                        GOTO(out, -EINVAL);
+                        GOTO(out, 0);
 
                 if (lsm->lsm_object_id == 0) {
                         CERROR("This really happens\n");
@@ -314,19 +377,20 @@ static void ll_delete_inode(struct inode *inode)
                         GOTO(out, -ENOMEM);
 
                 oa->o_id = lsm->lsm_object_id;
-                oa->o_easize = ll_mds_easize(inode->i_sb);
                 oa->o_mode = inode->i_mode;
-                oa->o_valid = OBD_MD_FLID | OBD_MD_FLEASIZE | OBD_MD_FLTYPE;
+                oa->o_valid = OBD_MD_FLID | OBD_MD_FLTYPE;
 
                 err = obd_destroy(ll_i2obdconn(inode), oa, lsm);
                 obdo_free(oa);
-                CDEBUG(D_SUPER, "obd destroy of objid "LPX64" error %d\n",
-                       lsm->lsm_object_id, err);
+                if (err)
+                        CDEBUG(D_SUPER, "obd destroy objid "LPX64" error %d\n",
+                               lsm->lsm_object_id, err);
         }
 out:
         clear_inode(inode);
         EXIT;
 }
+#endif
 
 /* like inode_setattr, but doesn't mark the inode dirty */
 static int ll_attr2inode(struct inode * inode, struct iattr * attr, int trunc)
@@ -364,18 +428,42 @@ int ll_inode_setattr(struct inode *inode, struct iattr *attr, int do_trunc)
 {
         struct ptlrpc_request *request = NULL;
         struct ll_sb_info *sbi = ll_i2sbi(inode);
-        int err;
+        int err = 0;
 
         ENTRY;
 
         /* change incore inode */
         ll_attr2inode(inode, attr, do_trunc);
 
-        err = mdc_setattr(&sbi->ll_mdc_conn, inode, attr, &request);
-        if (err)
-                CERROR("mdc_setattr fails (%d)\n", err);
-
-        ptlrpc_req_finished(request);
+        /* Don't send size changes to MDS to avoid "fast EA" problems, and
+         * also avoid a pointless RPC (we get file size from OST anyways).
+         */
+        attr->ia_valid &= ~ATTR_SIZE;
+        if (attr->ia_valid) {
+                err = mdc_setattr(&sbi->ll_mdc_conn, inode, attr, NULL, 0,
+                                  &request);
+                if (err)
+                        CERROR("mdc_setattr fails: err = %d\n", err);
+
+                ptlrpc_req_finished(request);
+                if (S_ISREG(inode->i_mode) && attr->ia_valid & ATTR_MTIME_SET) {
+                        struct lov_stripe_md *lsm = ll_i2info(inode)->lli_smd;
+                        struct obdo oa;
+                        int err2;
+
+                        CDEBUG(D_ERROR, "setting mtime on OST\n");
+                        oa.o_id = lsm->lsm_object_id;
+                        oa.o_mode = S_IFREG;
+                        oa.o_valid = OBD_MD_FLID |OBD_MD_FLTYPE |OBD_MD_FLMTIME;
+                        oa.o_mtime = attr->ia_mtime.tv_sec;
+                        err2 = obd_setattr(&sbi->ll_osc_conn, &oa, lsm, NULL);
+                        if (err2) {
+                                CERROR("obd_setattr fails: rc=%d\n", err);
+                                if (!err)
+                                        err = err2;
+                        }
+                }
+        }
 
         RETURN(err);
 }
@@ -392,16 +480,14 @@ int ll_setattr(struct dentry *de, struct iattr *attr)
 
 static int ll_statfs(struct super_block *sb, struct statfs *sfs)
 {
-        struct ptlrpc_request *request = NULL;
         struct ll_sb_info *sbi = ll_s2sbi(sb);
         struct obd_statfs osfs;
         int rc;
         ENTRY;
 
         memset(sfs, 0, sizeof(*sfs));
-        rc = mdc_statfs(&sbi->ll_mdc_conn, &osfs, &request);
+        rc = obd_statfs(&sbi->ll_mdc_conn, &osfs);
         statfs_unpack(sfs, &osfs);
-        ptlrpc_req_finished(request);
         if (rc)
                 CERROR("mdc_statfs fails: rc = %d\n", rc);
         else
@@ -440,16 +526,22 @@ out:
         RETURN(rc);
 }
 
-void ll_update_inode(struct inode *inode, struct mds_body *body)
+void ll_update_inode(struct inode *inode, struct mds_body *body,
+                     struct lov_mds_md *lmm)
 {
+        struct ll_inode_info *lli = ll_i2info(inode);
+
+        if (lmm != NULL)
+                obd_unpackmd(ll_i2obdconn(inode), &lli->lli_smd, lmm);
+
         if (body->valid & OBD_MD_FLID)
                 inode->i_ino = body->ino;
         if (body->valid & OBD_MD_FLATIME)
-                inode->i_atime = body->atime;
+                inode->i_atime.tv_sec = body->atime;
         if (body->valid & OBD_MD_FLMTIME)
-                inode->i_mtime = body->mtime;
+                inode->i_mtime.tv_sec = body->mtime;
         if (body->valid & OBD_MD_FLCTIME)
-                inode->i_ctime = body->ctime;
+                inode->i_ctime.tv_sec = body->ctime;
         if (body->valid & OBD_MD_FLMODE)
                 inode->i_mode = (inode->i_mode & S_IFMT)|(body->mode & ~S_IFMT);
         if (body->valid & OBD_MD_FLTYPE)
@@ -468,6 +560,8 @@ void ll_update_inode(struct inode *inode, struct mds_body *body)
                 inode->i_rdev = to_kdev_t(body->rdev);
         if (body->valid & OBD_MD_FLSIZE)
                 inode->i_size = body->size;
+        if (body->valid & OBD_MD_FLBLOCKS)
+                inode->i_blocks = body->blocks;
 }
 
 int ll_read_inode2(struct inode *inode, void *opaque)
@@ -475,44 +569,36 @@ int ll_read_inode2(struct inode *inode, void *opaque)
         struct ll_read_inode2_cookie *lic = opaque;
         struct mds_body *body = lic->lic_body;
         struct ll_inode_info *lli = ll_i2info(inode);
+        int rc = 0;
         ENTRY;
-        
+
         sema_init(&lli->lli_open_sem, 1);
-        lli->lli_mount_epoch = ll_i2sbi(inode)->ll_mount_epoch;
-        
-        /* core attributes first */
-        ll_update_inode(inode, body);
+        lli->flags = 0;
+        init_MUTEX(&lli->lli_getattr_sem);
+        /* these are 2.4 only, but putting them here for consistency.. */
+        spin_lock_init(&lli->lli_read_extent_lock);
+        INIT_LIST_HEAD(&lli->lli_read_extents);
 
-        //if (body->valid & OBD_MD_FLEASIZE)
-        if (lic && lic->lic_lmm) {
-                struct lov_mds_md *lmm = lic->lic_lmm;
-                int size;
+        LASSERT(!lli->lli_smd);
 
-                if (lmm->lmm_easize != ll_mds_easize(inode->i_sb)) {
-                        CERROR("Striping metadata size error %ld\n",
-                               inode->i_ino);
-                        LBUG();
-                }
-                size = ll_ost_easize(inode->i_sb);
-                OBD_ALLOC(lli->lli_smd, size);
-                if (!lli->lli_smd) {
-                        CERROR("No memory for %d\n", size);
-                        LBUG();
-                }
-                lov_unpackmd(lli->lli_smd, lmm);
-        } else {
-                lli->lli_smd = NULL;
-        }
+        /* core attributes first */
+        ll_update_inode(inode, body, lic ? lic->lic_lmm : NULL);
 
         /* Get the authoritative file size */
-        if (lli->lli_smd && (inode->i_mode & S_IFREG)) {
-                int rc;
-
-                rc = ll_file_size(inode, lli->lli_smd);
-                if (rc) {
-                        CERROR("ll_file_size: %d\n", rc);
-                        /* FIXME: need to somehow prevent inode creation */
-                        LBUG();
+        if (lli->lli_smd && S_ISREG(inode->i_mode)) {
+                struct ll_file_data *fd = file->private_data;
+                struct ldlm_extent extent = {0, OBD_OBJECT_EOF};
+                struct lustre_handle lockh = {0, 0};
+
+                LASSERT(lli->lli_smd->lsm_object_id != 0);
+
+                rc = ll_extent_lock(fd, inode, lsm, LCK_PR, &extent, &lockh);
+                if (err != ELDLM_OK && err != ELDLM_MATCHED) {
+                        ll_clear_inode(inode);
+                        make_bad_inode(inode);
+                } else {
+                        l_extent_unlock(fd, inode, lsm, LCK_PR, &extent,
+                                        &lockh);
                 }
         }
 
@@ -532,18 +618,19 @@ int ll_read_inode2(struct inode *inode, void *opaque)
                 inode->i_op = &ll_fast_symlink_inode_operations;
                 EXIT;
         } else {
-                init_special_inode(inode, inode->i_mode, 
+                init_special_inode(inode, inode->i_mode,
                                    kdev_t_to_nr(inode->i_rdev));
                 EXIT;
         }
-        return 0;
+
+        return rc;
 }
 
 static inline void invalidate_request_list(struct list_head *req_list)
 {
         struct list_head *tmp, *n;
         list_for_each_safe(tmp, n, req_list) {
-                struct ptlrpc_request *req = 
+                struct ptlrpc_request *req =
                         list_entry(tmp, struct ptlrpc_request, rq_list);
                 CERROR("invalidating req xid %d op %d to %s:%d\n",
                        (unsigned long long)req->rq_xid, req->rq_reqmsg->opc,
@@ -560,14 +647,14 @@ void ll_umount_begin(struct super_block *sb)
         struct list_head *ctmp;
 
         ENTRY;
-       
+
         list_for_each(ctmp, &sbi->ll_conn_chain) {
                 struct ptlrpc_connection *conn;
                 conn = list_entry(ctmp, struct ptlrpc_connection, c_sb_chain);
 
                 spin_lock(&conn->c_lock);
                 conn->c_flags |= CONN_INVALID;
-                invalidate_request_list(&conn->c_sending_head);
+                /*invalidate_request_list(&conn->c_sending_head);*/
                 invalidate_request_list(&conn->c_delayed_head);
                 spin_unlock(&conn->c_lock);
         }
@@ -580,47 +667,47 @@ static kmem_cache_t *ll_inode_cachep;
 
 static struct inode *ll_alloc_inode(struct super_block *sb)
 {
-       struct ll_inode_info *lli;
-       lli = kmem_cache_alloc(ll_inode_cachep, SLAB_KERNEL);
-       if (!lli)
-               return NULL;
+        struct ll_inode_info *lli;
+        lli = kmem_cache_alloc(ll_inode_cachep, SLAB_KERNEL);
+        if (!lli)
+                return NULL;
 
-       memset(lli, 0, sizeof(*lli));
+        memset(lli, 0, (char *)&lli->lli_vfs_inode - (char *)lli);
         sema_init(&lli->lli_open_sem, 1);
-        lli->lli_mount_epoch = ll_i2sbi(&lli->lli_vfs_inode)->ll_mount_epoch;
+        init_MUTEX(&lli->lli_size_valid_sem);
 
-       return &lli->lli_vfs_inode;
+        return &lli->lli_vfs_inode;
 }
 
 static void ll_destroy_inode(struct inode *inode)
 {
-       kmem_cache_free(ll_inode_cachep, LL_I(inode));
+        kmem_cache_free(ll_inode_cachep, ll_i2info(inode));
 }
 
 static void init_once(void * foo, kmem_cache_t * cachep, unsigned long flags)
 {
-       struct ll_inode_info *lli = foo;
+        struct ll_inode_info *lli = foo;
 
-       if ((flags & (SLAB_CTOR_VERIFY|SLAB_CTOR_CONSTRUCTOR)) ==
-           SLAB_CTOR_CONSTRUCTOR)
-               inode_init_once(&lli->lli_vfs_inode);
+        if ((flags & (SLAB_CTOR_VERIFY|SLAB_CTOR_CONSTRUCTOR)) ==
+            SLAB_CTOR_CONSTRUCTOR)
+                inode_init_once(&lli->lli_vfs_inode);
 }
+
 int ll_init_inodecache(void)
 {
-       ll_inode_cachep = kmem_cache_create("lustre_inode_cache",
-                                            sizeof(struct ll_inode_info),
-                                            0, SLAB_HWCACHE_ALIGN,
-                                            init_once, NULL);
-       if (ll_inode_cachep == NULL)
-               return -ENOMEM;
-       return 0;
+        ll_inode_cachep = kmem_cache_create("lustre_inode_cache",
+                                            sizeof(struct ll_inode_info),
+                                            0, SLAB_HWCACHE_ALIGN,
+                                            init_once, NULL);
+        if (ll_inode_cachep == NULL)
+                return -ENOMEM;
+        return 0;
 }
 
 void ll_destroy_inodecache(void)
 {
-       if (kmem_cache_destroy(ll_inode_cachep))
-               CERROR("ll_inode_cache: not all structures were freed\n");
+        if (kmem_cache_destroy(ll_inode_cachep))
+                CERROR("ll_inode_cache: not all structures were freed\n");
 }
 
 
@@ -631,33 +718,39 @@ struct super_operations ll_super_operations =
         alloc_inode: ll_alloc_inode,
         destroy_inode: ll_destroy_inode,
         clear_inode: ll_clear_inode,
-        delete_inode: ll_delete_inode,
+//        delete_inode: ll_delete_inode,
         put_super: ll_put_super,
         statfs: ll_statfs,
         umount_begin: ll_umount_begin
 };
 
+
 struct file_system_type lustre_lite_fs_type = {
         .owner  = THIS_MODULE,
-        .name =   "lustre_lite", 
+        .name =   "lustre_lite",
         .get_sb = ll_get_sb,
-        .kill_sb = kill_litter_super,
+        .kill_sb = kill_anon_super,
 };
 
 static int __init init_lustre_lite(void)
 {
         int rc;
-        printk(KERN_INFO "Lustre Lite 0.5.14, info@clusterfs.com\n");
+        printk(KERN_INFO "Lustre Lite Client File System; "
+               "info@clusterfs.com\n");
         rc = ll_init_inodecache();
-        if (rc) 
+        if (rc)
                 return -ENOMEM;
         ll_file_data_slab = kmem_cache_create("ll_file_data",
                                               sizeof(struct ll_file_data), 0,
                                               SLAB_HWCACHE_ALIGN, NULL, NULL);
-        if (ll_file_data_slab == NULL) { 
+        if (ll_file_data_slab == NULL) {
                 ll_destroy_inodecache();
                 return -ENOMEM;
         }
+
+        proc_lustre_fs_root = proc_lustre_root ?
+                              proc_mkdir("llite", proc_lustre_root) : NULL;
+
         return register_filesystem(&lustre_lite_fs_type);
 }
 
@@ -666,10 +759,14 @@ static void __exit exit_lustre_lite(void)
         unregister_filesystem(&lustre_lite_fs_type);
         ll_destroy_inodecache();
         kmem_cache_destroy(ll_file_data_slab);
+        if (proc_lustre_fs_root) {
+                lprocfs_remove(proc_lustre_fs_root);
+                proc_lustre_fs_root = NULL;
+        }
 }
 
 MODULE_AUTHOR("Cluster File Systems, Inc. <info@clusterfs.com>");
-MODULE_DESCRIPTION("Lustre Lite Client File System v1.0");
+MODULE_DESCRIPTION("Lustre Lite Client File System");
 MODULE_LICENSE("GPL");
 
 module_init(init_lustre_lite);