diff options
| author | Miklos Szeredi <mszeredi@suse.cz> | 2008-11-26 12:03:54 +0100 |
|---|---|---|
| committer | Miklos Szeredi <miklos@szeredi.hu> | 2008-11-26 12:03:54 +0100 |
| commit | 1729a16c2c92bbd9e54ac7cad3101fea2e073aa5 (patch) | |
| tree | 6814c8f122d6e7e6993d3af6ea427b3958b9a4f2 /fs/fuse/dev.c | |
| parent | ed313489badef16d700f5a3be50e8fd8f8294bc8 (diff) | |
| download | linux-3.10-1729a16c2c92bbd9e54ac7cad3101fea2e073aa5.tar.gz linux-3.10-1729a16c2c92bbd9e54ac7cad3101fea2e073aa5.tar.bz2 linux-3.10-1729a16c2c92bbd9e54ac7cad3101fea2e073aa5.zip | |
fuse: style fixes
Fix coding style errors reported by checkpatch and others. Uptdate
copyright date to 2008.
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Diffstat (limited to 'fs/fuse/dev.c')
| -rw-r--r-- | fs/fuse/dev.c | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c index b72361479be..85a23bb524f 100644 --- a/fs/fuse/dev.c +++ b/fs/fuse/dev.c @@ -1,6 +1,6 @@ /* FUSE: Filesystem in Userspace - Copyright (C) 2001-2006 Miklos Szeredi <miklos@szeredi.hu> + Copyright (C) 2001-2008 Miklos Szeredi <miklos@szeredi.hu> This program can be distributed under the terms of the GNU GPL. See the file COPYING. @@ -539,8 +539,8 @@ static int fuse_copy_fill(struct fuse_copy_state *cs) BUG_ON(!cs->nr_segs); cs->seglen = cs->iov[0].iov_len; cs->addr = (unsigned long) cs->iov[0].iov_base; - cs->iov ++; - cs->nr_segs --; + cs->iov++; + cs->nr_segs--; } down_read(¤t->mm->mmap_sem); err = get_user_pages(current, current->mm, cs->addr, 1, cs->write, 0, @@ -589,9 +589,11 @@ static int fuse_copy_page(struct fuse_copy_state *cs, struct page *page, kunmap_atomic(mapaddr, KM_USER1); } while (count) { - int err; - if (!cs->len && (err = fuse_copy_fill(cs))) - return err; + if (!cs->len) { + int err = fuse_copy_fill(cs); + if (err) + return err; + } if (page) { void *mapaddr = kmap_atomic(page, KM_USER1); void *buf = mapaddr + offset; @@ -631,9 +633,11 @@ static int fuse_copy_pages(struct fuse_copy_state *cs, unsigned nbytes, static int fuse_copy_one(struct fuse_copy_state *cs, void *val, unsigned size) { while (size) { - int err; - if (!cs->len && (err = fuse_copy_fill(cs))) - return err; + if (!cs->len) { + int err = fuse_copy_fill(cs); + if (err) + return err; + } fuse_copy_do(cs, &val, &size); } return 0; |