- fixes in llite with using mds_body vs. mdt_body

diff --git a/lustre/llite/dir.c b/lustre/llite/dir.c
index 83b541a..3b081f4 100644 (file)
--- a/lustre/llite/dir.c
+++ b/lustre/llite/dir.c
@@ -62,7 +62,7 @@ static int ll_dir_readpage(struct file *file, struct page *page)
         struct lu_fid fid;
         __u64 offset;
         struct ptlrpc_request *request;
-        struct mds_body *body;
+        struct mdt_body *body;
         int rc = 0;
         ENTRY;
 
@@ -484,7 +484,7 @@ static int ll_dir_ioctl(struct inode *inode, struct file *file,
                 struct lov_user_md *lump = (struct lov_user_md *)arg;
                 struct lov_mds_md *lmm;
                 struct lu_fid fid;
-                struct mds_body *body;
+                struct mdt_body *body;
                 int rc, lmmsize;
 
                 ll_inode2fid(&fid, inode);
@@ -537,7 +537,7 @@ static int ll_dir_ioctl(struct inode *inode, struct file *file,
         case IOC_MDC_GETSTRIPE: {
                 struct ptlrpc_request *request = NULL;
                 struct lu_fid fid;
-                struct mds_body *body;
+                struct mdt_body *body;
                 struct lov_user_md *lump;
                 struct lov_mds_md *lmm;
                 char *filename;

diff --git a/lustre/llite/file.c b/lustre/llite/file.c
index f611d8b..90d107b 100644 (file)
--- a/lustre/llite/file.c
+++ b/lustre/llite/file.c
@@ -174,7 +174,7 @@ int ll_local_open(struct file *file, struct lookup_intent *it,
 {
         struct ptlrpc_request *req = it->d.lustre.it_data;
         struct ll_inode_info *lli = ll_i2info(file->f_dentry->d_inode);
-        struct mds_body *body;
+        struct mdt_body *body;
         ENTRY;
 
         body = lustre_msg_buf (req->rq_repmsg, 1, sizeof (*body));

diff --git a/lustre/llite/llite_internal.h b/lustre/llite/llite_internal.h
index 9188f98..1777d85 100644 (file)
--- a/lustre/llite/llite_internal.h
+++ b/lustre/llite/llite_internal.h
@@ -180,6 +180,8 @@ struct ll_sb_info {
 
         struct list_head          ll_deathrow; /* inodes to be destroyed (b1443) */
         spinlock_t                ll_deathrow_lock;
+
+        struct lu_fid             ll_fid;
 };
 
 struct ll_ra_read {

diff --git a/lustre/llite/llite_lib.c b/lustre/llite/llite_lib.c
index d559c11..7212c7d 100644 (file)
--- a/lustre/llite/llite_lib.c
+++ b/lustre/llite/llite_lib.c
@@ -1155,7 +1155,7 @@ static void ll_replace_lsm(struct inode *inode, struct lov_stripe_md *lsm)
 void ll_update_inode(struct inode *inode, struct lustre_md *md)
 {
         struct ll_inode_info *lli = ll_i2info(inode);
-        struct mds_body *body = md->body;
+        struct mdt_body *body = md->body;
         struct lov_stripe_md *lsm = md->lsm;
 
         LASSERT ((lsm != NULL) == ((body->valid & OBD_MD_FLEASIZE) != 0));
@@ -1342,7 +1342,7 @@ int ll_iocontrol(struct inode *inode, struct file *file,
         switch(cmd) {
         case EXT3_IOC_GETFLAGS: {
                 struct lu_fid fid;
-                struct mds_body *body;
+                struct mdt_body *body;
 
                 ll_inode2fid(&fid, inode);
                 rc = mdc_getattr(sbi->ll_mdc_exp, &fid, OBD_MD_FLFLAGS,0,&req);

diff --git a/lustre/llite/namei.c b/lustre/llite/namei.c
index d1bbc8b..b7fc53b 100644 (file)
--- a/lustre/llite/namei.c
+++ b/lustre/llite/namei.c
@@ -537,7 +537,6 @@ static int ll_create_it(struct inode *dir, struct dentry *dentry, int mode,
                         struct lookup_intent *it)
 {
         struct inode *inode;
-        struct ptlrpc_request *request = it->d.lustre.it_data;
         int rc = 0;
         ENTRY;
 
@@ -569,7 +568,7 @@ static int ll_create_nd(struct inode *dir, struct dentry *dentry, int mode, stru
 static void ll_update_times(struct ptlrpc_request *request, int offset,
                             struct inode *inode)
 {
-        struct mds_body *body = lustre_msg_buf(request->rq_repmsg, offset,
+        struct mdt_body *body = lustre_msg_buf(request->rq_repmsg, offset,
                                                sizeof(*body));
         LASSERT(body);
 
@@ -786,7 +785,7 @@ static int ll_rmdir_raw(struct nameidata *nd)
 
 int ll_objects_destroy(struct ptlrpc_request *request, struct inode *dir)
 {
-        struct mds_body *body;
+        struct mdt_body *body;
         struct lov_mds_md *eadata;
         struct lov_stripe_md *lsm = NULL;
         struct obd_trans_info oti = { 0 };

diff --git a/lustre/llite/symlink.c b/lustre/llite/symlink.c
index ad077c5..a2d52ce 100644 (file)
--- a/lustre/llite/symlink.c
+++ b/lustre/llite/symlink.c
@@ -35,7 +35,7 @@ static int ll_readlink_internal(struct inode *inode,
         struct ll_inode_info *lli = ll_i2info(inode);
         struct ll_sb_info *sbi = ll_i2sbi(inode);
         struct lu_fid fid;
-        struct mds_body *body;
+        struct mdt_body *body;
         int rc, symlen = inode->i_size + 1;
         ENTRY;
 

diff --git a/lustre/llite/xattr.c b/lustre/llite/xattr.c
index a4cb190..cc6b0ab 100644 (file)
--- a/lustre/llite/xattr.c
+++ b/lustre/llite/xattr.c
@@ -156,7 +156,7 @@ int ll_getxattr_common(struct inode *inode, const char *name,
 {
         struct ll_sb_info *sbi = ll_i2sbi(inode);
         struct ptlrpc_request *req = NULL;
-        struct mds_body *body;
+        struct mdt_body *body;
         struct lu_fid fid;
         void *xdata;
         int xattr_type, rc;