X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fmds%2Fmds_reint.c;h=64e721e05c0648fea30ecd8eac88a04af458b0b5;hb=37e327a63542b40e80e676f868f9be5c0ba60736;hp=7eeed710318914a0213988d53d8ba220d6454d45;hpb=00102f342959b094f035b618c0b7acf477de35b4;p=fs%2Flustre-release.git

diff --git a/lustre/mds/mds_reint.c b/lustre/mds/mds_reint.c
index 7eeed71..64e721e 100644
--- a/lustre/mds/mds_reint.c
+++ b/lustre/mds/mds_reint.c
@@ -1,8 +1,10 @@
-/*
+/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
+ * vim:expandtab:shiftwidth=8:tabstop=8:
+ *
  *  linux/mds/mds_reint.c
- *  
+ *
  *  Lustre Metadata Server (mds) reintegration routines
- * 
+ *
  *  Copyright (C) 2002  Cluster File Systems, Inc.
  *  author: Peter Braam <braam@clusterfs.com>
  *
@@ -20,7 +22,6 @@
 #include <linux/fs.h>
 #include <linux/stat.h>
 #include <linux/locks.h>
-#include <linux/ext2_fs.h>
 #include <linux/quotaops.h>
 #include <asm/unistd.h>
 #include <asm/uaccess.h>
@@ -28,6 +29,7 @@
 #define DEBUG_SUBSYSTEM S_MDS
 
 #include <linux/obd_support.h>
+#include <linux/obd_class.h>
 #include <linux/obd.h>
 #include <linux/lustre_lib.h>
 #include <linux/lustre_idl.h>
@@ -38,322 +40,297 @@ extern struct ptlrpc_request *mds_prep_req(int size, int opcode, int namelen, ch
 
 static int mds_reint_setattr(struct mds_update_record *rec, struct ptlrpc_request *req)
 {
-	struct dentry *de;
-
-	de = mds_fid2dentry(req->rq_obd, rec->ur_fid1, NULL);
-	if (IS_ERR(de)) { 
-		req->rq_rephdr->status = -ESTALE;
-		return 0;
-	}
-
-        CDEBUG(D_INODE, "ino %ld\n", de->d_inode->i_ino);
-
-	/* a _really_ horrible hack to avoid removing the data stored
-	   in the block pointers; this data is the object id 
-           this will go into an extended attribute at some point.
-	*/
-	if ( rec->ur_iattr.ia_valid & ATTR_SIZE ) { 
-		/* ATTR_SIZE would invoke truncate: clear it */ 
-		rec->ur_iattr.ia_valid &= ~ATTR_SIZE;
-		de->d_inode->i_size = rec->ur_iattr.ia_size;
-		/* make sure _something_ gets set - so new inode
-		   goes to disk (probably won't work over XFS */
-		if (!rec->ur_iattr.ia_valid & ATTR_MODE) { 
-			rec->ur_iattr.ia_valid |= ATTR_MODE;
-			rec->ur_iattr.ia_mode = de->d_inode->i_mode;
-		}
-	}
-	if ( de->d_inode->i_op->setattr ) {
-		req->rq_rephdr->status =
-			de->d_inode->i_op->setattr(de, &rec->ur_iattr);
-	} else { 
-		req->rq_rephdr->status =
-			inode_setattr(de->d_inode, &rec->ur_iattr);
-	}
-
-	l_dput(de);
-	EXIT;
-	return 0;
-}
+        struct dentry *de;
+        struct inode *inode;
+        struct mds_obd *mds = &req->rq_obd->u.mds;
 
-/* 
-   XXX nasty hack: store the object id in the first two
-   direct block spots 
-*/
-static inline void mds_store_objid(struct inode *inode, __u64 *id)
-{
-	memcpy(&inode->u.ext2_i.i_data, id, sizeof(*id));
-}
+        de = mds_fid2dentry(mds, rec->ur_fid1, NULL);
+        if (IS_ERR(de) || OBD_FAIL_CHECK(OBD_FAIL_MDS_REINT_SETATTR)) {
+                req->rq_rephdr->status = -ESTALE;
+                RETURN(0);
+        }
 
+        inode = de->d_inode;
+        CDEBUG(D_INODE, "ino %ld\n", inode->i_ino);
 
-static int mds_reint_create(struct mds_update_record *rec, 
-			    struct ptlrpc_request *req)
+        mds_fs_setattr(mds, inode, NULL, &rec->ur_iattr);
+
+        OBD_FAIL_WRITE(OBD_FAIL_MDS_REINT_SETATTR_WRITE, inode->i_sb->s_dev);
+
+        if (inode->i_op->setattr)
+                req->rq_rephdr->status = inode->i_op->setattr(de, &rec->ur_iattr);
+        else
+                req->rq_rephdr->status = inode_setattr(inode, &rec->ur_iattr);
+
+        l_dput(de);
+        RETURN(0);
+}
+
+static int mds_reint_create(struct mds_update_record *rec,
+                            struct ptlrpc_request *req)
 {
-	int type = rec->ur_mode & S_IFMT;
-	struct dentry *de;
-	struct mds_rep *rep = req->rq_rep.mds;
-	struct dentry *dchild; 
-	int rc;
-	ENTRY;
-
-	de = mds_fid2dentry(req->rq_obd, rec->ur_fid1, NULL);
-	if (IS_ERR(de)) { 
-		req->rq_rephdr->status = -ESTALE;
-		EXIT;
-		return 0;
-	}
-        CDEBUG(D_INODE, "ino %ld\n", de->d_inode->i_ino);
-
-	dchild = lookup_one_len(rec->ur_name, de, rec->ur_namelen - 1);
-	rc = PTR_ERR(dchild);
-	if (IS_ERR(dchild)) { 
-		printk(__FUNCTION__ "child lookup error %d\n", rc);
-		dput(de); 
-		req->rq_rephdr->status = -ESTALE;
-		EXIT;
-		return 0;
-	}
-
-	if (dchild->d_inode) {
-		printk(__FUNCTION__ "child exists (dir %ld, name %s\n", 
-		       de->d_inode->i_ino, rec->ur_name);
-		dput(de); 
-		req->rq_rephdr->status = -ESTALE;
-		EXIT;
-		return 0;
-	}
-
-	switch (type) {
-	case S_IFREG: { 
-		rc = vfs_create(de->d_inode, dchild, rec->ur_mode);
-		
-		EXIT;
-		break;
-	}
-	case S_IFDIR: { 
-		rc = vfs_mkdir(de->d_inode, dchild, rec->ur_mode);
-		EXIT;
-		break;
-	} 
-	case S_IFLNK: { 
-		rc = vfs_symlink(de->d_inode, dchild, rec->ur_tgt);
-		EXIT;
-		break;
-	} 
-	case S_IFCHR:
-	case S_IFBLK:
-	case S_IFIFO:
-	case S_IFSOCK: { 
-		int rdev = rec->ur_id;
-		rc = vfs_mknod(de->d_inode, dchild, rec->ur_mode, rdev); 
-		EXIT;
-		break;
-	}
-	}
-
-	req->rq_rephdr->status = rc;
-	if (!rc) { 
-		if (type == S_IFREG)
-			mds_store_objid(dchild->d_inode, &rec->ur_id); 
-		dchild->d_inode->i_atime = rec->ur_time;
-		dchild->d_inode->i_ctime = rec->ur_time;
-		dchild->d_inode->i_mtime = rec->ur_time;
-		dchild->d_inode->i_uid = rec->ur_uid;
-		dchild->d_inode->i_gid = rec->ur_gid;
-		rep->ino = dchild->d_inode->i_ino;
-	}
-
-	dput(de);
-	dput(dchild); 
-	EXIT;
-	return 0;
+        int type = rec->ur_mode & S_IFMT;
+        struct dentry *de = NULL;
+        struct mds_rep *rep = req->rq_rep.mds;
+        struct mds_obd *mds = &req->rq_obd->u.mds;
+        struct dentry *dchild = NULL;
+        struct inode *dir;
+        int rc = 0;
+        ENTRY;
+
+        de = mds_fid2dentry(mds, rec->ur_fid1, NULL);
+        if (IS_ERR(de) || OBD_FAIL_CHECK(OBD_FAIL_MDS_REINT_CREATE)) {
+                LBUG();
+                GOTO(out_reint_create, (rc = -ESTALE));
+        }
+        dir = de->d_inode;
+        CDEBUG(D_INODE, "ino %ld\n", dir->i_ino);
+
+        dchild = lookup_one_len(rec->ur_name, de, rec->ur_namelen - 1);
+        if (IS_ERR(dchild)) {
+                CERROR("child lookup error %ld\n", PTR_ERR(dchild));
+                LBUG();
+                GOTO(out_reint_create, (rc = -ESTALE));
+        }
+
+        if (dchild->d_inode) {
+                CERROR("child exists (dir %ld, name %s)\n",
+                       dir->i_ino, rec->ur_name);
+                LBUG();
+                GOTO(out_reint_create, (rc = -EEXIST));
+        }
+
+        OBD_FAIL_WRITE(OBD_FAIL_MDS_REINT_CREATE_WRITE, dir->i_sb->s_dev);
+
+        switch (type) {
+        case S_IFREG: {
+                rc = vfs_create(dir, dchild, rec->ur_mode);
+                EXIT;
+                break;
+        }
+        case S_IFDIR: {
+                rc = vfs_mkdir(dir, dchild, rec->ur_mode);
+                EXIT;
+                break;
+        }
+        case S_IFLNK: {
+                rc = vfs_symlink(dir, dchild, rec->ur_tgt);
+                EXIT;
+                break;
+        }
+        case S_IFCHR:
+        case S_IFBLK:
+        case S_IFIFO:
+        case S_IFSOCK: {
+                int rdev = rec->ur_id;
+                rc = vfs_mknod(dir, dchild, rec->ur_mode, rdev);
+                EXIT;
+                break;
+        }
+        }
+
+        if (!rc) {
+                if (type == S_IFREG)
+                        rc = mds_fs_set_objid(mds, dchild->d_inode,
+                                              NULL, rec->ur_id);
+                dchild->d_inode->i_atime = rec->ur_time;
+                dchild->d_inode->i_ctime = rec->ur_time;
+                dchild->d_inode->i_mtime = rec->ur_time;
+                dchild->d_inode->i_uid = rec->ur_uid;
+                dchild->d_inode->i_gid = rec->ur_gid;
+                rep->ino = dchild->d_inode->i_ino;
+                rep->generation = dchild->d_inode->i_generation;
+        } else {
+                CERROR("error during create: %d\n", rc);
+                LBUG();
+        }
+
+out_reint_create:
+        req->rq_rephdr->status = rc;
+        l_dput(dchild);
+        l_dput(de);
+        RETURN(0);
 }
 
-static int mds_reint_unlink(struct mds_update_record *rec, 
-			    struct ptlrpc_request *req)
+static int mds_reint_unlink(struct mds_update_record *rec,
+                            struct ptlrpc_request *req)
 {
-	struct dentry *de;
-	struct dentry *dchild; 
-	int rc;
-	ENTRY;
-
-	de = mds_fid2dentry(req->rq_obd, rec->ur_fid1, NULL);
-	if (IS_ERR(de)) { 
-		req->rq_rephdr->status = -ESTALE;
-		EXIT;
-		return 0;
-	}
-        CDEBUG(D_INODE, "ino %ld\n", de->d_inode->i_ino);
-
-	dchild = lookup_one_len(rec->ur_name, de, rec->ur_namelen - 1);
-	rc = PTR_ERR(dchild);
-	if (IS_ERR(dchild)) { 
-		printk(__FUNCTION__ ": child lookup error %d\n", rc);
-		dput(de); 
-		req->rq_rephdr->status = -ESTALE;
-		EXIT;
-		return 0;
-	}
-
-	if (!dchild->d_inode) {
-		printk(__FUNCTION__ ": child doesn't exist (dir %ld, name %s\n", 
-		       de->d_inode->i_ino, rec->ur_name);
-		dput(de); 
-		req->rq_rephdr->status = -ESTALE;
-		EXIT;
-		return 0;
-	}
-
-	switch (dchild->d_inode->i_mode & S_IFMT) {
-	case S_IFDIR:
-		rc = vfs_rmdir(de->d_inode, dchild);
-		EXIT;
-		break;
-	default:
-		rc = vfs_unlink(de->d_inode, dchild);
-		
-		EXIT;
-		break;
-	}
-
-	req->rq_rephdr->status = rc;
-	dput(de);
-	dput(dchild); 
-	EXIT;
-	return 0;
+        struct dentry *de = NULL;
+        struct dentry *dchild = NULL;
+        struct mds_obd *mds = &req->rq_obd->u.mds;
+        struct inode *dir;
+        int rc = 0;
+        ENTRY;
+
+        de = mds_fid2dentry(mds, rec->ur_fid1, NULL);
+        if (IS_ERR(de) || OBD_FAIL_CHECK(OBD_FAIL_MDS_REINT_UNLINK)) {
+                LBUG();
+                GOTO(out_unlink, (rc = -ESTALE));
+        }
+        dir = de->d_inode;
+        CDEBUG(D_INODE, "ino %ld\n", dir->i_ino);
+
+        dchild = lookup_one_len(rec->ur_name, de, rec->ur_namelen - 1);
+        if (IS_ERR(dchild)) {
+                CERROR("child lookup error %ld\n", PTR_ERR(dchild));
+                LBUG();
+                GOTO(out_unlink, (rc = -ESTALE));
+        }
+
+        if (!dchild->d_inode) {
+                CERROR("child doesn't exist (dir %ld, name %s\n",
+                       dir->i_ino, rec->ur_name);
+                LBUG();
+                GOTO(out_unlink, (rc = -ESTALE));
+        }
+
+        if (dchild->d_inode->i_ino != rec->ur_fid2->id)
+                LBUG();
+        if (dchild->d_inode->i_generation != rec->ur_fid2->generation)
+                LBUG();
+
+        OBD_FAIL_WRITE(OBD_FAIL_MDS_REINT_UNLINK_WRITE, dir->i_sb->s_dev);
+
+        switch (dchild->d_inode->i_mode & S_IFMT) {
+        case S_IFDIR:
+                rc = vfs_rmdir(dir, dchild);
+                EXIT;
+                break;
+        default:
+                rc = vfs_unlink(dir, dchild);
+                EXIT;
+                break;
+        }
+
+out_unlink:
+        req->rq_rephdr->status = rc;
+        l_dput(dchild);
+        l_dput(de);
+        RETURN(0);
 }
 
-static int mds_reint_link(struct mds_update_record *rec, 
-			    struct ptlrpc_request *req)
+static int mds_reint_link(struct mds_update_record *rec,
+                            struct ptlrpc_request *req)
 {
-	struct dentry *de_src = NULL;
-	struct dentry *de_tgt_dir = NULL;
-	struct dentry *dchild = NULL; 
-	int rc;
-	ENTRY;
-
-	rc = -ESTALE;
-	de_src = mds_fid2dentry(req->rq_obd, rec->ur_fid1, NULL);
-	if (IS_ERR(de_src)) { 
-		EXIT;
-		goto out_link;
-	}
-
-	de_tgt_dir = mds_fid2dentry(req->rq_obd, rec->ur_fid2, NULL);
-	if (IS_ERR(de_tgt_dir)) { 
-		rc = -ESTALE;
-		EXIT;
-		goto out_link;
-	}
-
-	dchild = lookup_one_len(rec->ur_name, de_tgt_dir, rec->ur_namelen - 1);
-	if (IS_ERR(dchild)) { 
-		printk(__FUNCTION__ ": child lookup error %d\n", rc);
-		req->rq_rephdr->status = -ESTALE;
-		goto out_link;
-	}
-
-	if (dchild->d_inode) {
-		printk(__FUNCTION__ ": child exists (dir %ld, name %s\n", 
-		       de_tgt_dir->d_inode->i_ino, rec->ur_name);
-		EXIT;
-		goto out_link;
-	}
-
-	rc = vfs_link(de_src, de_tgt_dir->d_inode, dchild); 
+        struct dentry *de_src = NULL;
+        struct dentry *de_tgt_dir = NULL;
+        struct dentry *dchild = NULL;
+        int rc = 0;
+
+        ENTRY;
+        de_src = mds_fid2dentry(&req->rq_obd->u.mds, rec->ur_fid1, NULL);
+        if (IS_ERR(de_src) || OBD_FAIL_CHECK(OBD_FAIL_MDS_REINT_LINK)) {
+                GOTO(out_link, (rc = -ESTALE));
+        }
+
+        de_tgt_dir = mds_fid2dentry(&req->rq_obd->u.mds, rec->ur_fid2, NULL);
+        if (IS_ERR(de_tgt_dir)) {
+                GOTO(out_link, (rc = -ESTALE));
+        }
+
+        dchild = lookup_one_len(rec->ur_name, de_tgt_dir, rec->ur_namelen - 1);
+        if (IS_ERR(dchild)) {
+                CERROR("child lookup error %ld\n", PTR_ERR(dchild));
+                GOTO(out_link, (rc = -ESTALE));
+        }
+
+        if (dchild->d_inode) {
+                CERROR("child exists (dir %ld, name %s\n",
+                       de_tgt_dir->d_inode->i_ino, rec->ur_name);
+                GOTO(out_link, (rc = -EEXIST));
+        }
+
+        OBD_FAIL_WRITE(OBD_FAIL_MDS_REINT_LINK_WRITE,
+                       dchild->d_inode->i_sb->s_dev);
+
+        rc = vfs_link(de_src, de_tgt_dir->d_inode, dchild);
+        EXIT;
 
  out_link:
-	req->rq_rephdr->status = rc;
-	l_dput(de_src);
-	l_dput(de_tgt_dir); 
-	l_dput(dchild); 
-	EXIT;
-	return 0;
+        req->rq_rephdr->status = rc;
+        l_dput(dchild);
+        l_dput(de_tgt_dir);
+        l_dput(de_src);
+        return 0;
 }
 
 
-static int mds_reint_rename(struct mds_update_record *rec, 
-			    struct ptlrpc_request *req)
+static int mds_reint_rename(struct mds_update_record *rec,
+                            struct ptlrpc_request *req)
 {
-	struct dentry *de_srcdir = NULL;
-	struct dentry *de_tgtdir = NULL;
-	struct dentry *de_old = NULL; 
-	struct dentry *de_new = NULL; 
-	int rc;
-	ENTRY;
-
-	rc = -ESTALE;
-	de_srcdir = mds_fid2dentry(req->rq_obd, rec->ur_fid1, NULL);
-	if (IS_ERR(de_srcdir)) { 
-		EXIT;
-		goto out_rename;
-	}
-
-	de_tgtdir = mds_fid2dentry(req->rq_obd, rec->ur_fid2, NULL);
-	if (IS_ERR(de_tgtdir)) { 
-		rc = -ESTALE;
-		EXIT;
-		goto out_rename;
-	}
-
-	de_old = lookup_one_len(rec->ur_name, de_srcdir, rec->ur_namelen - 1);
-	if (IS_ERR(de_old)) { 
-		printk(__FUNCTION__ "child lookup error %d\n", rc);
-		goto out_rename;
-	}
-
-	de_new = lookup_one_len(rec->ur_tgt, de_tgtdir, rec->ur_tgtlen - 1);
-	if (IS_ERR(de_new)) { 
-		printk(__FUNCTION__ "child lookup error %d\n", rc);
-		goto out_rename;
-	}
-
-	rc = vfs_rename(de_srcdir->d_inode, de_old, de_tgtdir->d_inode, de_new);
+        struct dentry *de_srcdir = NULL;
+        struct dentry *de_tgtdir = NULL;
+        struct dentry *de_old = NULL;
+        struct dentry *de_new = NULL;
+        int rc = 0;
+        ENTRY;
+
+        de_srcdir = mds_fid2dentry(&req->rq_obd->u.mds, rec->ur_fid1, NULL);
+        if (IS_ERR(de_srcdir)) {
+                GOTO(out_rename, (rc = -ESTALE));
+        }
+
+        de_tgtdir = mds_fid2dentry(&req->rq_obd->u.mds, rec->ur_fid2, NULL);
+        if (IS_ERR(de_tgtdir)) {
+                GOTO(out_rename, (rc = -ESTALE));
+        }
+
+        de_old = lookup_one_len(rec->ur_name, de_srcdir, rec->ur_namelen - 1);
+        if (IS_ERR(de_old)) {
+                CERROR("child lookup error %ld\n", PTR_ERR(de_old));
+                GOTO(out_rename, (rc = -ESTALE));
+        }
+
+        de_new = lookup_one_len(rec->ur_tgt, de_tgtdir, rec->ur_tgtlen - 1);
+        if (IS_ERR(de_new)) {
+                CERROR("child lookup error %ld\n", PTR_ERR(de_new));
+                GOTO(out_rename, (rc = -ESTALE));
+        }
+
+        OBD_FAIL_WRITE(OBD_FAIL_MDS_REINT_RENAME_WRITE,
+                       de_srcdir->d_inode->i_sb->s_dev);
+
+        rc = vfs_rename(de_srcdir->d_inode, de_old, de_tgtdir->d_inode, de_new);
+        EXIT;
 
  out_rename:
-	req->rq_rephdr->status = rc;
-	l_dput(de_new);
-	l_dput(de_old); 
-	l_dput(de_tgtdir); 
-	l_dput(de_srcdir); 
-	EXIT;
-	return 0;
+        req->rq_rephdr->status = rc;
+        l_dput(de_new);
+        l_dput(de_old);
+        l_dput(de_tgtdir);
+        l_dput(de_srcdir);
+        return 0;
 }
 
-typedef int (*mds_reinter)(struct mds_update_record *, struct ptlrpc_request*); 
+typedef int (*mds_reinter)(struct mds_update_record *, struct ptlrpc_request*);
 
-static mds_reinter  reinters[REINT_MAX+1] = { 
-	[REINT_SETATTR]   mds_reint_setattr, 
-	[REINT_CREATE]    mds_reint_create,
-	[REINT_UNLINK]    mds_reint_unlink, 
-	[REINT_LINK]      mds_reint_link,
-	[REINT_RENAME]    mds_reint_rename
+static mds_reinter  reinters[REINT_MAX+1] = {
+        [REINT_SETATTR]   mds_reint_setattr,
+        [REINT_CREATE]    mds_reint_create,
+        [REINT_UNLINK]    mds_reint_unlink,
+        [REINT_LINK]      mds_reint_link,
+        [REINT_RENAME]    mds_reint_rename,
 };
 
 int mds_reint_rec(struct mds_update_record *rec, struct ptlrpc_request *req)
 {
-	int rc; 
-
-	if (rec->ur_opcode < 0 || rec->ur_opcode > REINT_MAX) { 
-		printk(__FUNCTION__ "opcode %d not valid\n", 
-		       rec->ur_opcode); 
-		rc = req->rq_status = -EINVAL;
-		return rc;
-	}
-
-	rc = mds_pack_rep(NULL, 0, NULL, 0, &req->rq_rephdr, &req->rq_rep.mds, 
-			  &req->rq_replen, &req->rq_repbuf);
-	if (rc) { 
-		EXIT;
-		printk("mds: out of memory\n");
-		rc = req->rq_status = -ENOMEM;
-		return rc;
-	}
-	req->rq_rephdr->seqno = req->rq_reqhdr->seqno;
-
-	rc = reinters[rec->ur_opcode](rec, req); 
-	req->rq_status = rc;
-
-	return rc;
-} 
-
+        int rc;
+
+        if (rec->ur_opcode < 0 || rec->ur_opcode > REINT_MAX) {
+                CERROR("opcode %d not valid\n", rec->ur_opcode);
+                rc = req->rq_status = -EINVAL;
+                RETURN(rc);
+        }
+
+        rc = mds_pack_rep(NULL, 0, NULL, 0, &req->rq_rephdr, &req->rq_rep,
+                          &req->rq_replen, &req->rq_repbuf);
+        if (rc) {
+                CERROR("mds: out of memory\n");
+                rc = req->rq_status = -ENOMEM;
+                RETURN(rc);
+        }
+        req->rq_rephdr->xid = req->rq_reqhdr->xid;
+
+        rc = reinters[rec->ur_opcode](rec, req);
+        return rc;
+}