X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fmdt%2Fmdt_hsm_cdt_requests.c;h=3125dccd9bb91ee2dc3961342eac5830a9002522;hb=a145fabe132bd498343ba854d4b30044487e8e31;hp=70298277ca41e7173767b420968c1abd8b646383;hpb=1294081248bbd3e9dc23eb1ffb275dc59a4278db;p=fs%2Flustre-release.git

diff --git a/lustre/mdt/mdt_hsm_cdt_requests.c b/lustre/mdt/mdt_hsm_cdt_requests.c
index 7029827..3125dcc 100644
--- a/lustre/mdt/mdt_hsm_cdt_requests.c
+++ b/lustre/mdt/mdt_hsm_cdt_requests.c
@@ -46,13 +46,10 @@
  */
 void dump_requests(char *prefix, struct coordinator *cdt)
 {
-	cfs_list_t		*pos;
 	struct cdt_agent_req	*car;
 
 	down_read(&cdt->cdt_request_lock);
-	cfs_list_for_each(pos, &cdt->cdt_requests) {
-		car = cfs_list_entry(pos, struct cdt_agent_req,
-				     car_request_list);
+	list_for_each_entry(car, &cdt->cdt_requests, car_request_list) {
 		CDEBUG(D_HSM, "%s fid="DFID" dfid="DFID
 		       " compound/cookie="LPX64"/"LPX64
 		       " action=%s archive#=%d flags="LPX64
@@ -66,7 +63,7 @@ void dump_requests(char *prefix, struct coordinator *cdt)
 		       car->car_hai->hai_extent.offset,
 		       car->car_hai->hai_extent.length,
 		       car->car_hai->hai_gid,
-		       cfs_atomic_read(&car->car_refcount),
+		       atomic_read(&car->car_refcount),
 		       car->car_canceled);
 	}
 	up_read(&cdt->cdt_request_lock);
@@ -243,7 +240,7 @@ struct cdt_agent_req *mdt_cdt_alloc_request(__u64 compound_id, __u32 archive_id,
 	if (car == NULL)
 		RETURN(ERR_PTR(-ENOMEM));
 
-	cfs_atomic_set(&car->car_refcount, 1);
+	atomic_set(&car->car_refcount, 1);
 	car->car_compound_id = compound_id;
 	car->car_archive_id = archive_id;
 	car->car_flags = flags;
@@ -280,7 +277,7 @@ void mdt_cdt_free_request(struct cdt_agent_req *car)
  */
 void mdt_cdt_get_request(struct cdt_agent_req *car)
 {
-	cfs_atomic_inc(&car->car_refcount);
+	atomic_inc(&car->car_refcount);
 }
 
 /**
@@ -290,8 +287,8 @@ void mdt_cdt_get_request(struct cdt_agent_req *car)
  */
 void mdt_cdt_put_request(struct cdt_agent_req *car)
 {
-	LASSERT(cfs_atomic_read(&car->car_refcount) > 0);
-	if (cfs_atomic_dec_and_test(&car->car_refcount))
+	LASSERT(atomic_read(&car->car_refcount) > 0);
+	if (atomic_dec_and_test(&car->car_refcount))
 		mdt_cdt_free_request(car);
 }
 
@@ -301,7 +298,7 @@ void mdt_cdt_put_request(struct cdt_agent_req *car)
  * \param cdt [IN] coordinator
  * \param cookie [IN] request cookie
  * \param fid [IN] fid
- * \retval request pointer
+ * \retval request pointer or NULL if not found
  */
 static struct cdt_agent_req *cdt_find_request_nolock(struct coordinator *cdt,
 						     __u64 cookie,
@@ -311,9 +308,9 @@ static struct cdt_agent_req *cdt_find_request_nolock(struct coordinator *cdt,
 	struct cdt_agent_req *found = NULL;
 	ENTRY;
 
-	cfs_list_for_each_entry(car, &cdt->cdt_requests, car_request_list) {
-		if ((car->car_hai->hai_cookie == cookie) ||
-		    ((fid != NULL) && lu_fid_eq(fid, &car->car_hai->hai_fid))) {
+	list_for_each_entry(car, &cdt->cdt_requests, car_request_list) {
+		if (car->car_hai->hai_cookie == cookie ||
+		    (fid != NULL && lu_fid_eq(fid, &car->car_hai->hai_fid))) {
 			mdt_cdt_get_request(car);
 			found = car;
 			break;
@@ -346,7 +343,7 @@ int mdt_cdt_add_request(struct coordinator *cdt, struct cdt_agent_req *new_car)
 		RETURN(-EEXIST);
 	}
 
-	cfs_list_add_tail(&new_car->car_request_list, &cdt->cdt_requests);
+	list_add_tail(&new_car->car_request_list, &cdt->cdt_requests);
 	up_write(&cdt->cdt_request_lock);
 
 	mdt_hsm_agent_update_statistics(cdt, 0, 0, 1, &new_car->car_uuid);
@@ -361,7 +358,7 @@ int mdt_cdt_add_request(struct coordinator *cdt, struct cdt_agent_req *new_car)
  * \param cdt [IN] coordinator
  * \param cookie [IN] request cookie
  * \param fid [IN] fid
- * \retval request pointer
+ * \retval request pointer or NULL if not found
  */
 struct cdt_agent_req *mdt_cdt_find_request(struct coordinator *cdt,
 					   const __u64 cookie,
@@ -391,7 +388,7 @@ int mdt_cdt_remove_request(struct coordinator *cdt, __u64 cookie)
 	down_write(&cdt->cdt_request_lock);
 	car = cdt_find_request_nolock(cdt, cookie, NULL);
 	if (car != NULL) {
-		cfs_list_del(&car->car_request_list);
+		list_del(&car->car_request_list);
 		up_write(&cdt->cdt_request_lock);
 
 		/* reference from cdt_requests list */
@@ -400,7 +397,7 @@ int mdt_cdt_remove_request(struct coordinator *cdt, __u64 cookie)
 		/* reference from cdt_find_request_nolock() */
 		mdt_cdt_put_request(car);
 
-		LASSERT(atomic_read(&cdt->cdt_request_count) > 0);
+		LASSERT(atomic_read(&cdt->cdt_request_count) >= 1);
 		atomic_dec(&cdt->cdt_request_count);
 
 		RETURN(0);
@@ -454,24 +451,24 @@ struct cdt_agent_req *mdt_cdt_update_request(struct coordinator *cdt,
 /**
  * seq_file method called to start access to /proc file
  */
-static void *mdt_hsm_request_proc_start(struct seq_file *s, loff_t *p)
+static void *mdt_hsm_active_requests_proc_start(struct seq_file *s, loff_t *p)
 {
 	struct mdt_device	*mdt = s->private;
 	struct coordinator	*cdt = &mdt->mdt_coordinator;
-	cfs_list_t		*pos;
+	struct list_head	*pos;
 	loff_t			 i;
 	ENTRY;
 
 	down_read(&cdt->cdt_request_lock);
 
-	if (cfs_list_empty(&cdt->cdt_requests))
+	if (list_empty(&cdt->cdt_requests))
 		RETURN(NULL);
 
 	if (*p == 0)
 		RETURN(SEQ_START_TOKEN);
 
 	i = 0;
-	cfs_list_for_each(pos, &cdt->cdt_requests) {
+	list_for_each(pos, &cdt->cdt_requests) {
 		i++;
 		if (i >= *p)
 			RETURN(pos);
@@ -483,11 +480,12 @@ static void *mdt_hsm_request_proc_start(struct seq_file *s, loff_t *p)
  * seq_file method called to get next item
  * just returns NULL at eof
  */
-static void *mdt_hsm_request_proc_next(struct seq_file *s, void *v, loff_t *p)
+static void *mdt_hsm_active_requests_proc_next(struct seq_file *s, void *v,
+					       loff_t *p)
 {
 	struct mdt_device	*mdt = s->private;
 	struct coordinator	*cdt = &mdt->mdt_coordinator;
-	cfs_list_t		*pos = v;
+	struct list_head	*pos = v;
 	ENTRY;
 
 	if (pos == SEQ_START_TOKEN)
@@ -505,9 +503,9 @@ static void *mdt_hsm_request_proc_next(struct seq_file *s, void *v, loff_t *p)
 /**
  * display request data
  */
-static int mdt_hsm_request_proc_show(struct seq_file *s, void *v)
+static int mdt_hsm_active_requests_proc_show(struct seq_file *s, void *v)
 {
-	cfs_list_t		*pos = v;
+	struct list_head	*pos = v;
 	struct cdt_agent_req	*car;
 	char			 buf[12];
 	__u64			 data_moved;
@@ -516,14 +514,14 @@ static int mdt_hsm_request_proc_show(struct seq_file *s, void *v)
 	if (pos == SEQ_START_TOKEN)
 		RETURN(0);
 
-	car = cfs_list_entry(pos, struct cdt_agent_req, car_request_list);
+	car = list_entry(pos, struct cdt_agent_req, car_request_list);
 	mdt_cdt_get_work_done(car, &data_moved);
 
 	seq_printf(s, "fid="DFID" dfid="DFID
 		   " compound/cookie="LPX64"/"LPX64
 		   " action=%s archive#=%d flags="LPX64
 		   " extent="LPX64"-"LPX64" gid="LPX64
-		   " data=[%s] canceled=%d uuid=%s done="LPU64"%%\n",
+		   " data=[%s] canceled=%d uuid=%s done="LPU64"\n",
 		   PFID(&car->car_hai->hai_fid),
 		   PFID(&car->car_hai->hai_dfid),
 		   car->car_compound_id, car->car_hai->hai_cookie,
@@ -541,7 +539,7 @@ static int mdt_hsm_request_proc_show(struct seq_file *s, void *v)
 /**
  * seq_file method called to stop access to /proc file
  */
-static void mdt_hsm_request_proc_stop(struct seq_file *s, void *v)
+static void mdt_hsm_active_requests_proc_stop(struct seq_file *s, void *v)
 {
 	struct mdt_device	*mdt = s->private;
 	struct coordinator	*cdt = &mdt->mdt_coordinator;
@@ -553,41 +551,38 @@ static void mdt_hsm_request_proc_stop(struct seq_file *s, void *v)
 }
 
 /* hsm agent list proc functions */
-static const struct seq_operations mdt_hsm_request_proc_ops = {
-	.start		= mdt_hsm_request_proc_start,
-	.next		= mdt_hsm_request_proc_next,
-	.show		= mdt_hsm_request_proc_show,
-	.stop		= mdt_hsm_request_proc_stop,
+static const struct seq_operations mdt_hsm_active_requests_proc_ops = {
+	.start		= mdt_hsm_active_requests_proc_start,
+	.next		= mdt_hsm_active_requests_proc_next,
+	.show		= mdt_hsm_active_requests_proc_show,
+	.stop		= mdt_hsm_active_requests_proc_stop,
 };
 
 /**
  * public function called at open of /proc file to get
  * list of agents
  */
-static int lprocfs_open_hsm_request(struct inode *inode, struct file *file)
+static int lprocfs_open_hsm_active_requests(struct inode *inode,
+					    struct file *file)
 {
 	struct seq_file	*s;
 	int		 rc;
 	ENTRY;
 
-	if (LPROCFS_ENTRY_AND_CHECK(PDE(inode)))
-		RETURN(-ENOENT);
-
-	rc = seq_open(file, &mdt_hsm_request_proc_ops);
+	rc = seq_open(file, &mdt_hsm_active_requests_proc_ops);
 	if (rc) {
-		LPROCFS_EXIT();
 		RETURN(rc);
 	}
 	s = file->private_data;
-	s->private = PDE(inode)->data;
+	s->private = PDE_DATA(inode);
 
 	RETURN(rc);
 }
 
 /* methods to access hsm request list */
-const struct file_operations mdt_hsm_request_fops = {
+const struct file_operations mdt_hsm_active_requests_fops = {
 	.owner		= THIS_MODULE,
-	.open		= lprocfs_open_hsm_request,
+	.open		= lprocfs_open_hsm_active_requests,
 	.read		= seq_read,
 	.llseek		= seq_lseek,
 	.release	= lprocfs_seq_release,