Message ID | 20201028090540.1070935-1-zhangxinhao1@huawei.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | [1/3] hw/9pfs : add spaces around operator | expand |
On Mittwoch, 28. Oktober 2020 10:05:38 CET jokenzhang wrote: > Signed-off-by: jokenzhang <zhangxinhao1@huawei.com> > Signed-off-by: Kai Deng <dengkai1@huawei.com> > Reported-by: Euler Robot <euler.robot@huawei.com> > --- > hw/9pfs/9p-local.c | 10 +++++----- > hw/9pfs/9p.c | 16 ++++++++-------- > 2 files changed, 13 insertions(+), 13 deletions(-) It would make sense to mention the actual purpose of this patch: fix code style. Same applies to the other 2 patches. > > diff --git a/hw/9pfs/9p-local.c b/hw/9pfs/9p-local.c > index 3107637209..af52c1daac 100644 > --- a/hw/9pfs/9p-local.c > +++ b/hw/9pfs/9p-local.c > @@ -162,13 +162,13 @@ static void local_mapped_file_attr(int dirfd, const > char *name, memset(buf, 0, ATTR_MAX); > while (fgets(buf, ATTR_MAX, fp)) { > if (!strncmp(buf, "virtfs.uid", 10)) { > - stbuf->st_uid = atoi(buf+11); > + stbuf->st_uid = atoi(buf + 11); > } else if (!strncmp(buf, "virtfs.gid", 10)) { > - stbuf->st_gid = atoi(buf+11); > + stbuf->st_gid = atoi(buf + 11); > } else if (!strncmp(buf, "virtfs.mode", 11)) { > - stbuf->st_mode = atoi(buf+12); > + stbuf->st_mode = atoi(buf + 12); > } else if (!strncmp(buf, "virtfs.rdev", 11)) { > - stbuf->st_rdev = atoi(buf+12); > + stbuf->st_rdev = atoi(buf + 12); > } > memset(buf, 0, ATTR_MAX); > } > @@ -823,7 +823,7 @@ static int local_open2(FsContext *fs_ctx, V9fsPath > *dir_path, const char *name, if (fd == -1) { > goto out; > } > - credp->fc_mode = credp->fc_mode|S_IFREG; > + credp->fc_mode = credp->fc_mode | S_IFREG; > if (fs_ctx->export_flags & V9FS_SM_MAPPED) { > /* Set cleint credentials in xattr */ > err = local_set_xattrat(dirfd, name, credp); > diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c > index 741d222c3f..94df440fc7 100644 > --- a/hw/9pfs/9p.c > +++ b/hw/9pfs/9p.c > @@ -1091,7 +1091,7 @@ static mode_t v9mode_to_mode(uint32_t mode, V9fsString > *extension) } > } > > - if (!(ret&~0777)) { > + if (!(ret & ~0777)) { > ret |= S_IFREG; > } > > @@ -2776,7 +2776,7 @@ static void coroutine_fn v9fs_create(void *opaque) > v9fs_path_unlock(s); > } else { > err = v9fs_co_open2(pdu, fidp, &name, -1, > - omode_to_uflags(mode)|O_CREAT, perm, &stbuf); > + omode_to_uflags(mode) | O_CREAT, perm, &stbuf); > if (err < 0) { > goto out; > } > @@ -3428,7 +3428,7 @@ static int v9fs_fill_statfs(V9fsState *s, V9fsPDU > *pdu, struct statfs *stbuf) * compute bsize factor based on host file > system block size > * and client msize > */ > - bsize_factor = (s->msize - P9_IOHDRSZ)/stbuf->f_bsize; > + bsize_factor = (s->msize - P9_IOHDRSZ) / stbuf->f_bsize; > if (!bsize_factor) { > bsize_factor = 1; > } > @@ -3440,9 +3440,9 @@ static int v9fs_fill_statfs(V9fsState *s, V9fsPDU > *pdu, struct statfs *stbuf) * adjust(divide) the number of blocks, free > blocks and available * blocks by bsize factor > */ > - f_blocks = stbuf->f_blocks/bsize_factor; > - f_bfree = stbuf->f_bfree/bsize_factor; > - f_bavail = stbuf->f_bavail/bsize_factor; > + f_blocks = stbuf->f_blocks / bsize_factor; > + f_bfree = stbuf->f_bfree / bsize_factor; > + f_bavail = stbuf->f_bavail / bsize_factor; > f_files = stbuf->f_files; > f_ffree = stbuf->f_ffree; > fsid_val = (unsigned int) stbuf->f_fsid.__val[0] | > @@ -4185,6 +4185,6 @@ static void __attribute__((__constructor__)) > v9fs_set_fd_limit(void) error_report("Failed to get the resource limit"); > exit(1); > } > - open_fd_hw = rlim.rlim_cur - MIN(400, rlim.rlim_cur/3); > - open_fd_rc = rlim.rlim_cur/2; > + open_fd_hw = rlim.rlim_cur - MIN(400, rlim.rlim_cur / 3); > + open_fd_rc = rlim.rlim_cur / 2; > } Best regards, Christian Schoenebeck
diff --git a/hw/9pfs/9p-local.c b/hw/9pfs/9p-local.c index 3107637209..af52c1daac 100644 --- a/hw/9pfs/9p-local.c +++ b/hw/9pfs/9p-local.c @@ -162,13 +162,13 @@ static void local_mapped_file_attr(int dirfd, const char *name, memset(buf, 0, ATTR_MAX); while (fgets(buf, ATTR_MAX, fp)) { if (!strncmp(buf, "virtfs.uid", 10)) { - stbuf->st_uid = atoi(buf+11); + stbuf->st_uid = atoi(buf + 11); } else if (!strncmp(buf, "virtfs.gid", 10)) { - stbuf->st_gid = atoi(buf+11); + stbuf->st_gid = atoi(buf + 11); } else if (!strncmp(buf, "virtfs.mode", 11)) { - stbuf->st_mode = atoi(buf+12); + stbuf->st_mode = atoi(buf + 12); } else if (!strncmp(buf, "virtfs.rdev", 11)) { - stbuf->st_rdev = atoi(buf+12); + stbuf->st_rdev = atoi(buf + 12); } memset(buf, 0, ATTR_MAX); } @@ -823,7 +823,7 @@ static int local_open2(FsContext *fs_ctx, V9fsPath *dir_path, const char *name, if (fd == -1) { goto out; } - credp->fc_mode = credp->fc_mode|S_IFREG; + credp->fc_mode = credp->fc_mode | S_IFREG; if (fs_ctx->export_flags & V9FS_SM_MAPPED) { /* Set cleint credentials in xattr */ err = local_set_xattrat(dirfd, name, credp); diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c index 741d222c3f..94df440fc7 100644 --- a/hw/9pfs/9p.c +++ b/hw/9pfs/9p.c @@ -1091,7 +1091,7 @@ static mode_t v9mode_to_mode(uint32_t mode, V9fsString *extension) } } - if (!(ret&~0777)) { + if (!(ret & ~0777)) { ret |= S_IFREG; } @@ -2776,7 +2776,7 @@ static void coroutine_fn v9fs_create(void *opaque) v9fs_path_unlock(s); } else { err = v9fs_co_open2(pdu, fidp, &name, -1, - omode_to_uflags(mode)|O_CREAT, perm, &stbuf); + omode_to_uflags(mode) | O_CREAT, perm, &stbuf); if (err < 0) { goto out; } @@ -3428,7 +3428,7 @@ static int v9fs_fill_statfs(V9fsState *s, V9fsPDU *pdu, struct statfs *stbuf) * compute bsize factor based on host file system block size * and client msize */ - bsize_factor = (s->msize - P9_IOHDRSZ)/stbuf->f_bsize; + bsize_factor = (s->msize - P9_IOHDRSZ) / stbuf->f_bsize; if (!bsize_factor) { bsize_factor = 1; } @@ -3440,9 +3440,9 @@ static int v9fs_fill_statfs(V9fsState *s, V9fsPDU *pdu, struct statfs *stbuf) * adjust(divide) the number of blocks, free blocks and available * blocks by bsize factor */ - f_blocks = stbuf->f_blocks/bsize_factor; - f_bfree = stbuf->f_bfree/bsize_factor; - f_bavail = stbuf->f_bavail/bsize_factor; + f_blocks = stbuf->f_blocks / bsize_factor; + f_bfree = stbuf->f_bfree / bsize_factor; + f_bavail = stbuf->f_bavail / bsize_factor; f_files = stbuf->f_files; f_ffree = stbuf->f_ffree; fsid_val = (unsigned int) stbuf->f_fsid.__val[0] | @@ -4185,6 +4185,6 @@ static void __attribute__((__constructor__)) v9fs_set_fd_limit(void) error_report("Failed to get the resource limit"); exit(1); } - open_fd_hw = rlim.rlim_cur - MIN(400, rlim.rlim_cur/3); - open_fd_rc = rlim.rlim_cur/2; + open_fd_hw = rlim.rlim_cur - MIN(400, rlim.rlim_cur / 3); + open_fd_rc = rlim.rlim_cur / 2; }