Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit b9ca67b2ddf021491a3741d9555e8ff59b2175ba

Authored by Miklos Szeredi
1 parent 595afaf9e6
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

fuse: fix lock annotations 

Sparse doesn't understand lock annotations of the form
__releases(&foo->lock).  Change them to __releases(foo->lock).  Same
for __acquires().

Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>

Showing 2 changed files with 18 additions and 16 deletions Side-by-side Diff

... ... @@ -276,7 +276,7 @@
276 276 * Called with fc->lock, unlocks it
277 277 */
278 278 static void request_end(struct fuse_conn *fc, struct fuse_req *req)
279   -__releases(&fc->lock)
  279 +__releases(fc->lock)
280 280 {
281 281 void (*end) (struct fuse_conn *, struct fuse_req *) = req->end;
282 282 req->end = NULL;
... ... @@ -306,8 +306,8 @@
306 306  
307 307 static void wait_answer_interruptible(struct fuse_conn *fc,
308 308 struct fuse_req *req)
309   -__releases(&fc->lock)
310   -__acquires(&fc->lock)
  309 +__releases(fc->lock)
  310 +__acquires(fc->lock)
311 311 {
312 312 if (signal_pending(current))
313 313 return;
... ... @@ -325,8 +325,8 @@
325 325 }
326 326  
327 327 static void request_wait_answer(struct fuse_conn *fc, struct fuse_req *req)
328   -__releases(&fc->lock)
329   -__acquires(&fc->lock)
  328 +__releases(fc->lock)
  329 +__acquires(fc->lock)
330 330 {
331 331 if (!fc->no_interrupt) {
332 332 /* Any signal may interrupt this */
... ... @@ -905,8 +905,8 @@
905 905  
906 906 /* Wait until a request is available on the pending list */
907 907 static void request_wait(struct fuse_conn *fc)
908   -__releases(&fc->lock)
909   -__acquires(&fc->lock)
  908 +__releases(fc->lock)
  909 +__acquires(fc->lock)
910 910 {
911 911 DECLARE_WAITQUEUE(wait, current);
912 912  
... ... @@ -934,7 +934,7 @@
934 934 */
935 935 static int fuse_read_interrupt(struct fuse_conn *fc, struct fuse_copy_state *cs,
936 936 size_t nbytes, struct fuse_req *req)
937   -__releases(&fc->lock)
  937 +__releases(fc->lock)
938 938 {
939 939 struct fuse_in_header ih;
940 940 struct fuse_interrupt_in arg;
... ... @@ -1720,8 +1720,8 @@
1720 1720 * This function releases and reacquires fc->lock
1721 1721 */
1722 1722 static void end_requests(struct fuse_conn *fc, struct list_head *head)
1723   -__releases(&fc->lock)
1724   -__acquires(&fc->lock)
  1723 +__releases(fc->lock)
  1724 +__acquires(fc->lock)
1725 1725 {
1726 1726 while (!list_empty(head)) {
1727 1727 struct fuse_req *req;
... ... @@ -1744,8 +1744,8 @@
1744 1744 * locked).
1745 1745 */
1746 1746 static void end_io_requests(struct fuse_conn *fc)
1747   -__releases(&fc->lock)
1748   -__acquires(&fc->lock)
  1747 +__releases(fc->lock)
  1748 +__acquires(fc->lock)
1749 1749 {
1750 1750 while (!list_empty(&fc->io)) {
1751 1751 struct fuse_req *req =
... ... @@ -1770,6 +1770,8 @@
1770 1770 }
1771 1771  
1772 1772 static void end_queued_requests(struct fuse_conn *fc)
  1773 +__releases(fc->lock)
  1774 +__acquires(fc->lock)
1773 1775 {
1774 1776 fc->max_background = UINT_MAX;
1775 1777 flush_bg_queue(fc);
... ... @@ -1144,8 +1144,8 @@
1144 1144  
1145 1145 /* Called under fc->lock, may release and reacquire it */
1146 1146 static void fuse_send_writepage(struct fuse_conn *fc, struct fuse_req *req)
1147   -__releases(&fc->lock)
1148   -__acquires(&fc->lock)
  1147 +__releases(fc->lock)
  1148 +__acquires(fc->lock)
1149 1149 {
1150 1150 struct fuse_inode *fi = get_fuse_inode(req->inode);
1151 1151 loff_t size = i_size_read(req->inode);
... ... @@ -1183,8 +1183,8 @@
1183 1183 * Called with fc->lock
1184 1184 */
1185 1185 void fuse_flush_writepages(struct inode *inode)
1186   -__releases(&fc->lock)
1187   -__acquires(&fc->lock)
  1186 +__releases(fc->lock)
  1187 +__acquires(fc->lock)
1188 1188 {
1189 1189 struct fuse_conn *fc = get_fuse_conn(inode);
1190 1190 struct fuse_inode *fi = get_fuse_inode(inode);