mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-25 02:09:42 +00:00
fuse: clean up annotations of fc->lock
Makes the existing annotations match the more common one per line style and adds a few missing annotations. Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
This commit is contained in:
parent
c9f0523d88
commit
5d9ec854bf
2 changed files with 16 additions and 5 deletions
|
@ -269,7 +269,7 @@ static void flush_bg_queue(struct fuse_conn *fc)
|
|||
* Called with fc->lock, unlocks it
|
||||
*/
|
||||
static void request_end(struct fuse_conn *fc, struct fuse_req *req)
|
||||
__releases(fc->lock)
|
||||
__releases(&fc->lock)
|
||||
{
|
||||
void (*end) (struct fuse_conn *, struct fuse_req *) = req->end;
|
||||
req->end = NULL;
|
||||
|
@ -298,7 +298,8 @@ static void request_end(struct fuse_conn *fc, struct fuse_req *req)
|
|||
|
||||
static void wait_answer_interruptible(struct fuse_conn *fc,
|
||||
struct fuse_req *req)
|
||||
__releases(fc->lock) __acquires(fc->lock)
|
||||
__releases(&fc->lock)
|
||||
__acquires(&fc->lock)
|
||||
{
|
||||
if (signal_pending(current))
|
||||
return;
|
||||
|
@ -316,7 +317,8 @@ static void queue_interrupt(struct fuse_conn *fc, struct fuse_req *req)
|
|||
}
|
||||
|
||||
static void request_wait_answer(struct fuse_conn *fc, struct fuse_req *req)
|
||||
__releases(fc->lock) __acquires(fc->lock)
|
||||
__releases(&fc->lock)
|
||||
__acquires(&fc->lock)
|
||||
{
|
||||
if (!fc->no_interrupt) {
|
||||
/* Any signal may interrupt this */
|
||||
|
@ -668,6 +670,8 @@ static int request_pending(struct fuse_conn *fc)
|
|||
|
||||
/* Wait until a request is available on the pending list */
|
||||
static void request_wait(struct fuse_conn *fc)
|
||||
__releases(&fc->lock)
|
||||
__acquires(&fc->lock)
|
||||
{
|
||||
DECLARE_WAITQUEUE(wait, current);
|
||||
|
||||
|
@ -695,7 +699,7 @@ static void request_wait(struct fuse_conn *fc)
|
|||
*/
|
||||
static int fuse_read_interrupt(struct fuse_conn *fc, struct fuse_req *req,
|
||||
const struct iovec *iov, unsigned long nr_segs)
|
||||
__releases(fc->lock)
|
||||
__releases(&fc->lock)
|
||||
{
|
||||
struct fuse_copy_state cs;
|
||||
struct fuse_in_header ih;
|
||||
|
@ -1012,6 +1016,8 @@ static unsigned fuse_dev_poll(struct file *file, poll_table *wait)
|
|||
* This function releases and reacquires fc->lock
|
||||
*/
|
||||
static void end_requests(struct fuse_conn *fc, struct list_head *head)
|
||||
__releases(&fc->lock)
|
||||
__acquires(&fc->lock)
|
||||
{
|
||||
while (!list_empty(head)) {
|
||||
struct fuse_req *req;
|
||||
|
@ -1034,7 +1040,8 @@ static void end_requests(struct fuse_conn *fc, struct list_head *head)
|
|||
* locked).
|
||||
*/
|
||||
static void end_io_requests(struct fuse_conn *fc)
|
||||
__releases(fc->lock) __acquires(fc->lock)
|
||||
__releases(&fc->lock)
|
||||
__acquires(&fc->lock)
|
||||
{
|
||||
while (!list_empty(&fc->io)) {
|
||||
struct fuse_req *req =
|
||||
|
|
|
@ -1068,6 +1068,8 @@ static void fuse_writepage_finish(struct fuse_conn *fc, struct fuse_req *req)
|
|||
|
||||
/* Called under fc->lock, may release and reacquire it */
|
||||
static void fuse_send_writepage(struct fuse_conn *fc, struct fuse_req *req)
|
||||
__releases(&fc->lock)
|
||||
__acquires(&fc->lock)
|
||||
{
|
||||
struct fuse_inode *fi = get_fuse_inode(req->inode);
|
||||
loff_t size = i_size_read(req->inode);
|
||||
|
@ -1105,6 +1107,8 @@ static void fuse_send_writepage(struct fuse_conn *fc, struct fuse_req *req)
|
|||
* Called with fc->lock
|
||||
*/
|
||||
void fuse_flush_writepages(struct inode *inode)
|
||||
__releases(&fc->lock)
|
||||
__acquires(&fc->lock)
|
||||
{
|
||||
struct fuse_conn *fc = get_fuse_conn(inode);
|
||||
struct fuse_inode *fi = get_fuse_inode(inode);
|
||||
|
|
Loading…
Reference in a new issue