From 99fc705996285ed2746c0c8ae8313d0a04d62ec9 Mon Sep 17 00:00:00 2001 From: Josh Triplett Date: Fri, 29 Sep 2006 01:59:25 -0700 Subject: [PATCH] afs: add lock annotations to afs_proc_cell_servers_{start,stop} afs_proc_cell_servers_start acquires a lock, and afs_proc_cell_servers_stop releases that lock. Add lock annotations to these two functions so that sparse can check callers for lock pairing, and so that sparse will not complain about these functions since they intentionally use locks in this manner. Signed-off-by: Josh Triplett Acked-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- fs/afs/proc.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'fs/afs') diff --git a/fs/afs/proc.c b/fs/afs/proc.c index 101d21b6c03..86463ec9ccb 100644 --- a/fs/afs/proc.c +++ b/fs/afs/proc.c @@ -775,6 +775,7 @@ static int afs_proc_cell_servers_release(struct inode *inode, * first item */ static void *afs_proc_cell_servers_start(struct seq_file *m, loff_t *_pos) + __acquires(m->private->sv_lock) { struct list_head *_p; struct afs_cell *cell = m->private; @@ -823,6 +824,7 @@ static void *afs_proc_cell_servers_next(struct seq_file *p, void *v, * clean up after reading from the cells list */ static void afs_proc_cell_servers_stop(struct seq_file *p, void *v) + __releases(p->private->sv_lock) { struct afs_cell *cell = p->private; -- cgit v1.2.3 From 65e6f5bc8149165efb9d7bdbd142bb837d5edfeb Mon Sep 17 00:00:00 2001 From: David Howells Date: Tue, 29 Aug 2006 19:06:03 +0100 Subject: [PATCH] BLOCK: Don't call block_sync_page() from AFS [try #6] The AFS filesystem no longer needs to override its sync_page() op. Signed-Off-By: David Howells Signed-off-by: Jens Axboe --- fs/afs/file.c | 1 - 1 file changed, 1 deletion(-) (limited to 'fs/afs') diff --git a/fs/afs/file.c b/fs/afs/file.c index 67d6634101f..02264560d17 100644 --- a/fs/afs/file.c +++ b/fs/afs/file.c @@ -37,7 +37,6 @@ struct inode_operations afs_file_inode_operations = { const struct address_space_operations afs_fs_aops = { .readpage = afs_file_readpage, - .sync_page = block_sync_page, .set_page_dirty = __set_page_dirty_nobuffers, .releasepage = afs_file_releasepage, .invalidatepage = afs_file_invalidatepage, -- cgit v1.2.3 From d366e40a1cabd453be6e2609caa7e12f9ca17b1f Mon Sep 17 00:00:00 2001 From: David Howells Date: Tue, 29 Aug 2006 19:06:29 +0100 Subject: [PATCH] BLOCK: Remove no-longer necessary linux/buffer_head.h inclusions [try #6] Remove inclusions of linux/buffer_head.h that are no longer necessary due to the transfer of a number of things out of there. Signed-Off-By: David Howells Signed-off-by: Jens Axboe --- fs/afs/file.c | 1 - 1 file changed, 1 deletion(-) (limited to 'fs/afs') diff --git a/fs/afs/file.c b/fs/afs/file.c index 02264560d17..2e8c42639ea 100644 --- a/fs/afs/file.c +++ b/fs/afs/file.c @@ -16,7 +16,6 @@ #include #include #include -#include #include "volume.h" #include "vnode.h" #include -- cgit v1.2.3