b=17545 control DCACHE_LUSTRE_INVALID flag with MDS_INODELOCK_LOOKUP lock

[fs/lustre-release.git] / lustre / mdc / mdc_lib.c

diff --git a/lustre/mdc/mdc_lib.c b/lustre/mdc/mdc_lib.c
index 48b753e..3ba6799 100644 (file)
--- a/lustre/mdc/mdc_lib.c
+++ b/lustre/mdc/mdc_lib.c
@@ -181,8 +181,6 @@ static __u32 mds_pack_open_flags(__u32 flags, __u32 mode)
                 cr_flags |= MDS_OPEN_SYNC;
         if (flags & O_DIRECTORY)
                 cr_flags |= MDS_OPEN_DIRECTORY;
-        if (mode  & M_JOIN_FILE)
-                cr_flags |= MDS_OPEN_JOIN_FILE;
 #ifdef FMODE_EXEC
         if (flags & FMODE_EXEC)
                 cr_flags |= MDS_FMODE_EXEC;
@@ -194,18 +192,6 @@ static __u32 mds_pack_open_flags(__u32 flags, __u32 mode)
 }
 
 /* packing of MDS records */
-void mdc_join_pack(struct ptlrpc_request *req,
-                   struct md_op_data *op_data,
-                   __u64 head_size)
-{
-        struct mdt_rec_join *rec;
-
-        rec = req_capsule_client_get(&req->rq_pill, &RMF_REC_JOINFILE);
-        LASSERT(rec != NULL);
-        rec->jr_fid = op_data->op_fid2;
-        rec->jr_headsize = head_size;
-}
-
 void mdc_open_pack(struct ptlrpc_request *req, struct md_op_data *op_data,
                    __u32 mode, __u64 rdev, __u32 flags, const void *lmm,
                    int lmmlen)
@@ -493,9 +479,9 @@ static int mdc_req_avail(struct client_obd *cli, struct mdc_cache_waiter *mcw)
 {
         int rc;
         ENTRY;
-        spin_lock(&cli->cl_loi_list_lock);
+        client_obd_list_lock(&cli->cl_loi_list_lock);
         rc = list_empty(&mcw->mcw_entry);
-        spin_unlock(&cli->cl_loi_list_lock);
+        client_obd_list_unlock(&cli->cl_loi_list_lock);
         RETURN(rc);
 };
 
@@ -507,15 +493,15 @@ void mdc_enter_request(struct client_obd *cli)
         struct mdc_cache_waiter mcw;
         struct l_wait_info lwi = { 0 };
 
-        spin_lock(&cli->cl_loi_list_lock);
+        client_obd_list_lock(&cli->cl_loi_list_lock);
         if (cli->cl_r_in_flight >= cli->cl_max_rpcs_in_flight) {
                 list_add_tail(&mcw.mcw_entry, &cli->cl_cache_waiters);
                 cfs_waitq_init(&mcw.mcw_waitq);
-                spin_unlock(&cli->cl_loi_list_lock);
+                client_obd_list_unlock(&cli->cl_loi_list_lock);
                 l_wait_event(mcw.mcw_waitq, mdc_req_avail(cli, &mcw), &lwi);
         } else {
                 cli->cl_r_in_flight++;
-                spin_unlock(&cli->cl_loi_list_lock);
+                client_obd_list_unlock(&cli->cl_loi_list_lock);
         }
 }
 
@@ -524,7 +510,7 @@ void mdc_exit_request(struct client_obd *cli)
         struct list_head *l, *tmp;
         struct mdc_cache_waiter *mcw;
 
-        spin_lock(&cli->cl_loi_list_lock);
+        client_obd_list_lock(&cli->cl_loi_list_lock);
         cli->cl_r_in_flight--;
         list_for_each_safe(l, tmp, &cli->cl_cache_waiters) {
                 
@@ -540,5 +526,5 @@ void mdc_exit_request(struct client_obd *cli)
         }
         /* Empty waiting list? Decrease reqs in-flight number */
         
-        spin_unlock(&cli->cl_loi_list_lock);
+        client_obd_list_unlock(&cli->cl_loi_list_lock);
 }