Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-5710 all: second batch of corrected typos and grammar errors
[fs/lustre-release.git]
/
lustre
/
ldlm
/
ldlm_request.c
diff --git
a/lustre/ldlm/ldlm_request.c
b/lustre/ldlm/ldlm_request.c
index
836521f
..
54ecbdd
100644
(file)
--- a/
lustre/ldlm/ldlm_request.c
+++ b/
lustre/ldlm/ldlm_request.c
@@
-27,7
+27,7
@@
* Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
* Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2010, 201
3
, Intel Corporation.
+ * Copyright (c) 2010, 201
4
, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
*/
/*
* This file is part of Lustre, http://www.lustre.org/
@@
-131,7
+131,6
@@
int ldlm_expired_completion_wait(void *data)
RETURN(0);
}
RETURN(0);
}
-EXPORT_SYMBOL(ldlm_expired_completion_wait);
/**
* Calculate the Completion timeout (covering enqueue, BL AST, data flush,
/**
* Calculate the Completion timeout (covering enqueue, BL AST, data flush,
@@
-414,7
+413,6
@@
int ldlm_glimpse_ast(struct ldlm_lock *lock, void *reqp)
{
return -ELDLM_NO_LOCK_DATA;
}
{
return -ELDLM_NO_LOCK_DATA;
}
-EXPORT_SYMBOL(ldlm_glimpse_ast);
/**
* Enqueue a local lock (typically on a server).
/**
* Enqueue a local lock (typically on a server).
@@
-814,7
+812,7
@@
int ldlm_prep_elc_req(struct obd_export *exp, struct ptlrpc_request *req,
dlm = req_capsule_client_get(pill, &RMF_DLM_REQ);
LASSERT(dlm);
/* Skip first lock handler in ldlm_request_pack(),
dlm = req_capsule_client_get(pill, &RMF_DLM_REQ);
LASSERT(dlm);
/* Skip first lock handler in ldlm_request_pack(),
-
* this method will incr
ment @lock_count according
+
* this method will incre
ment @lock_count according
* to the lock handle amount actually written to
* the buffer. */
dlm->lock_count = canceloff;
* to the lock handle amount actually written to
* the buffer. */
dlm->lock_count = canceloff;
@@
-1099,7
+1097,6
@@
int ldlm_cli_convert(struct lustre_handle *lockh, int new_mode, __u32 *flags)
ptlrpc_req_finished(req);
return rc;
}
ptlrpc_req_finished(req);
return rc;
}
-EXPORT_SYMBOL(ldlm_cli_convert);
/**
* Cancel locks locally.
/**
* Cancel locks locally.
@@
-1270,7
+1267,6
@@
int ldlm_cli_cancel_req(struct obd_export *exp, struct list_head *cancels,
out:
return sent ? sent : rc;
}
out:
return sent ? sent : rc;
}
-EXPORT_SYMBOL(ldlm_cli_cancel_req);
static inline struct ldlm_pool *ldlm_imp2pl(struct obd_import *imp)
{
static inline struct ldlm_pool *ldlm_imp2pl(struct obd_import *imp)
{
@@
-1326,7
+1322,6
@@
int ldlm_cli_update_pool(struct ptlrpc_request *req)
RETURN(0);
}
RETURN(0);
}
-EXPORT_SYMBOL(ldlm_cli_update_pool);
/**
* Client side lock cancel.
/**
* Client side lock cancel.
@@
-1428,7
+1423,6
@@
int ldlm_cli_cancel_list_local(struct list_head *cancels, int count,
RETURN(count);
}
RETURN(count);
}
-EXPORT_SYMBOL(ldlm_cli_cancel_list_local);
/**
* Cancel as many locks as possible w/o sending any RPCs (e.g. to write back
/**
* Cancel as many locks as possible w/o sending any RPCs (e.g. to write back
@@
-1995,7
+1989,6
@@
int ldlm_cli_cancel_unused(struct ldlm_namespace *ns,
RETURN(ELDLM_OK);
}
}
RETURN(ELDLM_OK);
}
}
-EXPORT_SYMBOL(ldlm_cli_cancel_unused);
/* Lock iterators. */
/* Lock iterators. */
@@
-2036,7
+2029,6
@@
int ldlm_resource_foreach(struct ldlm_resource *res, ldlm_iterator_t iter,
unlock_res(res);
RETURN(rc);
}
unlock_res(res);
RETURN(rc);
}
-EXPORT_SYMBOL(ldlm_resource_foreach);
struct iter_helper_data {
ldlm_iterator_t iter;
struct iter_helper_data {
ldlm_iterator_t iter;
@@
-2069,7
+2061,6
@@
void ldlm_namespace_foreach(struct ldlm_namespace *ns,
ldlm_res_iter_helper, &helper);
}
ldlm_res_iter_helper, &helper);
}
-EXPORT_SYMBOL(ldlm_namespace_foreach);
/* non-blocking function to manipulate a lock whose cb_data is being put away.
* return 0: find no resource
/* non-blocking function to manipulate a lock whose cb_data is being put away.
* return 0: find no resource
@@
-2320,4
+2311,3
@@
int ldlm_replay_locks(struct obd_import *imp)
RETURN(rc);
}
RETURN(rc);
}
-EXPORT_SYMBOL(ldlm_replay_locks);