- unland b_fid to HEAD

[fs/lustre-release.git] / lustre / mds / mds_lmv.c

diff --git a/lustre/mds/mds_lmv.c b/lustre/mds/mds_lmv.c
index 7b7343c..df80c75 100644 (file)
--- a/lustre/mds/mds_lmv.c
+++ b/lustre/mds/mds_lmv.c
@@ -54,23 +54,29 @@ int mds_lmv_connect(struct obd_device *obd, char * lmv_name)
         if (IS_ERR(mds->mds_lmv_obd))
                 RETURN(PTR_ERR(mds->mds_lmv_obd));
 
-        if (mds->mds_lmv_obd)
+        if (mds->mds_lmv_connected)
                 RETURN(0);
 
+        down(&mds->mds_lmv_sem);
+        if (mds->mds_lmv_connected) {
+                up(&mds->mds_lmv_sem);
+                RETURN(0);
+        }
+
         mds->mds_lmv_obd = class_name2obd(lmv_name);
         if (!mds->mds_lmv_obd) {
                 CERROR("MDS cannot locate LMV %s\n",
                        lmv_name);
                 mds->mds_lmv_obd = ERR_PTR(-ENOTCONN);
-                RETURN(-ENOTCONN);
+                GOTO(err_last, rc = -ENOTCONN);
         }
 
-        rc = obd_connect(&conn, mds->mds_lmv_obd, &obd->obd_uuid);
+        rc = obd_connect(&conn, mds->mds_lmv_obd, &obd->obd_uuid, OBD_OPT_MDS_CONNECTION);
         if (rc) {
                 CERROR("MDS cannot connect to LMV %s (%d)\n",
                        lmv_name, rc);
                 mds->mds_lmv_obd = ERR_PTR(rc);
-                RETURN(rc);
+                GOTO(err_last, rc);
         }
         mds->mds_lmv_exp = class_conn2export(&conn);
         if (mds->mds_lmv_exp == NULL)
@@ -104,7 +110,9 @@ int mds_lmv_connect(struct obd_device *obd, char * lmv_name)
                           "inter_mds", 0, NULL);
         if (rc)
                 GOTO(err_reg, rc);
-        
+
+        mds->mds_lmv_connected = 1;
+        up(&mds->mds_lmv_sem);
        RETURN(0);
 
 err_reg:
@@ -113,6 +121,8 @@ err_discon:
         obd_disconnect(mds->mds_lmv_exp, 0);
         mds->mds_lmv_exp = NULL;
         mds->mds_lmv_obd = ERR_PTR(rc);
+err_last:
+        up(&mds->mds_lmv_sem);
         RETURN(rc);
 }
 
@@ -135,7 +145,10 @@ int mds_lmv_disconnect(struct obd_device *obd, int flags)
         int rc = 0;
         ENTRY;
 
+        down(&mds->mds_lmv_sem);
         if (!IS_ERR(mds->mds_lmv_obd) && mds->mds_lmv_exp != NULL) {
+                LASSERT(mds->mds_lmv_connected != 0);
+                mds->mds_lmv_connected = 0;
                 obd_register_observer(mds->mds_lmv_obd, NULL);
 
                 /* if obd_disconnect fails (probably because the export was
@@ -148,6 +161,7 @@ int mds_lmv_disconnect(struct obd_device *obd, int flags)
                 mds->mds_lmv_exp = NULL;
                 mds->mds_lmv_obd = NULL;
         }
+        up(&mds->mds_lmv_sem);
 
         RETURN(rc);
 }
@@ -177,7 +191,7 @@ int mds_get_lmv_attr(struct obd_device *obd, struct inode *inode,
                *mea = NULL;
        } else
                 rc = 0;
-                        
+
        RETURN(rc);
 }
 
@@ -224,7 +238,7 @@ static int dc_new_page_to_cache(struct dir_cache * dirc)
         page = alloc_page(GFP_KERNEL);
         if (page == NULL)
                 return -ENOMEM;
-        list_add_tail(&page->list, &dirc->list);
+        list_add_tail(&page->lru, &dirc->list);
         dirc->cur = page_address(page);
         dirc->free = PAGE_SIZE;
         return 0;
@@ -287,13 +301,13 @@ static int flush_buffer_onto_mds(struct dirsplit_control *dc, int mdsnum)
         list_for_each_safe(cur, tmp, &ca->list) {
                 struct page *page;
 
-                page = list_entry(cur, struct page, list);
+                page = list_entry(cur, struct page, lru);
                 LASSERT(page != NULL);
 
                 retrieve_generation_numbers(dc, page_address(page));
 
                 ca->brwc.pg = page;
-                ca->brwc.off = 0;
+                ca->brwc.disk_offset = ca->brwc.page_offset = 0;
                 ca->brwc.count = PAGE_SIZE;
                 ca->brwc.flag = 0;
                 ca->oa.o_mds = mdsnum;
@@ -320,7 +334,7 @@ static int remove_entries_from_orig_dir(struct dirsplit_control *dc, int mdsnum)
 
         ca = dc->cache + mdsnum;
         list_for_each_safe(cur, tmp, &ca->list) {
-                page = list_entry(cur, struct page, list);
+                page = list_entry(cur, struct page, lru);
                 buf = page_address(page);
                 end = buf + PAGE_SIZE;
 
@@ -464,8 +478,8 @@ cleanup:
                         continue;
                 list_for_each_safe(cur, tmp, &dc.cache[i].list) {
                         struct page *page;
-                        page = list_entry(cur, struct page, list);
-                        list_del(&page->list);
+                        page = list_entry(cur, struct page, lru);
+                        list_del(&page->lru);
                         __free_page(page);
                 }
         }
@@ -1002,11 +1016,19 @@ int mds_lock_and_check_slave(int offset, struct ptlrpc_request *req,
         struct dentry *dentry = NULL;
         struct lvfs_run_ctxt saved;
         int cleanup_phase = 0;
+        struct mds_req_sec_desc *rsd;
         struct mds_body *body;
         struct lvfs_ucred uc;
         int rc, update_mode;
         ENTRY;
 
+        rsd = lustre_swab_mds_secdesc(req, MDS_REQ_SECDESC_OFF);
+        if (!rsd) {
+                CERROR("Can't unpack security desc\n");
+                GOTO(cleanup, rc = -EFAULT);
+        }
+        mds_squash_root(&obd->u.mds, rsd, &req->rq_peer.peer_id.nid); 
+
         body = lustre_swab_reqbuf(req, offset, sizeof(*body),
                                   lustre_swab_mds_body);
         if (body == NULL) {
@@ -1027,11 +1049,12 @@ int mds_lock_and_check_slave(int offset, struct ptlrpc_request *req,
 
         LASSERT(S_ISDIR(dentry->d_inode->i_mode));
 
-        uc.luc_fsuid = body->fsuid;
-        uc.luc_fsgid = body->fsgid;
-        uc.luc_cap = body->capability;
-        uc.luc_suppgid1 = body->suppgid;
-        uc.luc_suppgid2 = -1;
+        rc = mds_init_ucred(&uc, rsd);
+        if (rc) {
+                CERROR("can't init ucred\n");
+                GOTO(cleanup, rc);
+        }
+
         push_ctxt(&saved, &obd->obd_lvfs_ctxt, &uc);
 
         rc = 0;
@@ -1045,6 +1068,7 @@ cleanup:
                         ldlm_lock_decref(lockh, LCK_EX);
                 l_dput(dentry);
                 pop_ctxt(&saved, &obd->obd_lvfs_ctxt, &uc);
+                mds_exit_ucred(&uc);
         default:
                 break;
         }