summaryrefslogtreecommitdiff
path: root/fs/fuse/file.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-09-14 18:15:29 +0400
committerTakashi Iwai <tiwai@suse.de>2010-09-14 18:15:29 +0400
commitf3fbba6efbab93b9850821d41a75b02286d18315 (patch)
treee2a680674d334c6e455d1a89a4dbfc3f549cb6d1 /fs/fuse/file.c
parent15c5ab607045e278ebf4d2ca4aea2250617d50ca (diff)
parent147fcf1c211f1a87bf4d0711b7e9637f3d6ce080 (diff)
downloadlinux-f3fbba6efbab93b9850821d41a75b02286d18315.tar.xz
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'fs/fuse/file.c')
-rw-r--r--fs/fuse/file.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index 147c1f71bdb9..c8224587123f 100644
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -1144,8 +1144,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)
+__releases(fc->lock)
+__acquires(fc->lock)
{
struct fuse_inode *fi = get_fuse_inode(req->inode);
loff_t size = i_size_read(req->inode);
@@ -1183,8 +1183,8 @@ __acquires(&fc->lock)
* Called with fc->lock
*/
void fuse_flush_writepages(struct inode *inode)
-__releases(&fc->lock)
-__acquires(&fc->lock)
+__releases(fc->lock)
+__acquires(fc->lock)
{
struct fuse_conn *fc = get_fuse_conn(inode);
struct fuse_inode *fi = get_fuse_inode(inode);