X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fmdt%2Fmdt_hsm_cdt_requests.c;h=febca0e0696c27880e6293fab30a82dcd2159d28;hb=4b3748ae6f8859ee56a142bdf03b8006e888b868;hp=98bb7c4985dc63c5192272ee4c871314f82eddaa;hpb=ccabce23bd9e366c345c852f565766a799f61238;p=fs%2Flustre-release.git

diff --git a/lustre/mdt/mdt_hsm_cdt_requests.c b/lustre/mdt/mdt_hsm_cdt_requests.c
index 98bb7c4..febca0e 100644
--- a/lustre/mdt/mdt_hsm_cdt_requests.c
+++ b/lustre/mdt/mdt_hsm_cdt_requests.c
@@ -103,13 +103,13 @@ void dump_requests(char *prefix, struct coordinator *cdt)
 	down_read(&cdt->cdt_request_lock);
 	list_for_each_entry(car, &cdt->cdt_request_list, car_request_list) {
 		CDEBUG(D_HSM, "%s fid="DFID" dfid="DFID
-		       " compound/cookie=%#llx/%#llx"
+		       " cookie=%#llx"
 		       " action=%s archive#=%d flags=%#llx"
 		       " extent=%#llx-%#llx"
 		       " gid=%#llx refcount=%d canceled=%d\n",
 		       prefix, PFID(&car->car_hai->hai_fid),
 		       PFID(&car->car_hai->hai_dfid),
-		       car->car_compound_id, car->car_hai->hai_cookie,
+		       car->car_hai->hai_cookie,
 		       hsm_copytool_action2name(car->car_hai->hai_action),
 		       car->car_archive_id, car->car_flags,
 		       car->car_hai->hai_extent.offset,
@@ -280,7 +280,6 @@ static void mdt_cdt_init_request_tree(struct cdt_req_progress *crp)
 
 /** Allocate/init an agent request and its sub-structures.
  *
- * \param compound_id [IN]
  * \param archive_id [IN]
  * \param flags [IN]
  * \param uuid [IN]
@@ -288,8 +287,8 @@ static void mdt_cdt_init_request_tree(struct cdt_req_progress *crp)
  * \retval car [OUT] success valid structure
  * \retval car [OUT]
  */
-struct cdt_agent_req *mdt_cdt_alloc_request(__u64 compound_id, __u32 archive_id,
-					    __u64 flags, struct obd_uuid *uuid,
+struct cdt_agent_req *mdt_cdt_alloc_request(__u32 archive_id, __u64 flags,
+					    struct obd_uuid *uuid,
 					    struct hsm_action_item *hai)
 {
 	struct cdt_agent_req *car;
@@ -300,7 +299,6 @@ struct cdt_agent_req *mdt_cdt_alloc_request(__u64 compound_id, __u32 archive_id,
 		RETURN(ERR_PTR(-ENOMEM));
 
 	atomic_set(&car->car_refcount, 1);
-	car->car_compound_id = compound_id;
 	car->car_archive_id = archive_id;
 	car->car_flags = flags;
 	car->car_canceled = 0;
@@ -581,7 +579,7 @@ static int mdt_hsm_active_requests_proc_show(struct seq_file *s, void *v)
 		   " data=[%s] canceled=%d uuid=%s done=%llu\n",
 		   PFID(&car->car_hai->hai_fid),
 		   PFID(&car->car_hai->hai_dfid),
-		   car->car_compound_id, car->car_hai->hai_cookie,
+		   0ULL /* compound_id */, car->car_hai->hai_cookie,
 		   hsm_copytool_action2name(car->car_hai->hai_action),
 		   car->car_archive_id, car->car_flags,
 		   car->car_hai->hai_extent.offset,
@@ -619,8 +617,8 @@ static const struct seq_operations mdt_hsm_active_requests_proc_ops = {
  * public function called at open of /proc file to get
  * list of agents
  */
-static int lprocfs_open_hsm_active_requests(struct inode *inode,
-					    struct file *file)
+static int ldebugfs_open_hsm_active_requests(struct inode *inode,
+					     struct file *file)
 {
 	struct seq_file	*s;
 	int		 rc;
@@ -631,7 +629,7 @@ static int lprocfs_open_hsm_active_requests(struct inode *inode,
 		RETURN(rc);
 	}
 	s = file->private_data;
-	s->private = PDE_DATA(inode);
+	s->private = inode->i_private;
 
 	RETURN(rc);
 }
@@ -639,9 +637,9 @@ static int lprocfs_open_hsm_active_requests(struct inode *inode,
 /* methods to access hsm request list */
 const struct file_operations mdt_hsm_active_requests_fops = {
 	.owner		= THIS_MODULE,
-	.open		= lprocfs_open_hsm_active_requests,
+	.open		= ldebugfs_open_hsm_active_requests,
 	.read		= seq_read,
 	.llseek		= seq_lseek,
-	.release	= lprocfs_seq_release,
+	.release	= seq_release,
 };