Skip to content

L
linux-davinci
Commit 84b3db04 authored by Jeff Dike's avatar Jeff Dike Committed by Linus Torvalds
Browse files
Options

uml: fix hostfs style 

Style fixes in hostfs.
Signed-off-by: default avatarJeff Dike <jdike@linux.intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent baabd156
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 202 additions and 172 deletions
fs/hostfs/hostfs.h
View file @ 84b3db04
......@@ -3,7 +3,8 @@
#include "os.h"
/* These are exactly the same definitions as in fs.h, but the names are
/*
* These are exactly the same definitions as in fs.h, but the names are
* changed so that this file can be included in both kernel and user files.
*/
......@@ -21,7 +22,8 @@
#define HOSTFS_ATTR_FORCE 512 /* Not a change, but a change it */
#define HOSTFS_ATTR_ATTR_FLAG 1024
/* If you are very careful, you'll notice that these two are missing:
/*
* If you are very careful, you'll notice that these two are missing:
*
* #define ATTR_KILL_SUID 2048
* #define ATTR_KILL_SGID 4096
......@@ -76,7 +78,8 @@ extern int make_symlink(const char *from, const char *to);
extern int unlink_file(const char *file);
extern int do_mkdir(const char *file, int mode);
extern int do_rmdir(const char *file);
extern int do_mknod(const char *file, int mode, unsigned int major, unsigned int minor);
extern int do_mknod(const char *file, int mode, unsigned int major,
unsigned int minor);
extern int link_file(const char *from, const char *to);
extern int do_readlink(char *file, char *buf, int size);
extern int rename_file(char *from, char *to);
......
fs/hostfs/hostfs_kern.c
View file @ 84b3db04
This diff is collapsed.
fs/hostfs/hostfs_user.c
View file @ 84b3db04
......@@ -3,19 +3,21 @@
* Licensed under the GPL
*/
#include <unistd.h>
#include <stdio.h>
#include <fcntl.h>
#include <stddef.h>
#include <unistd.h>
#include <dirent.h>
#include <errno.h>
#include <utime.h>
#include <fcntl.h>
#include <string.h>
#include <sys/stat.h>
#include <sys/time.h>
#include <sys/types.h>
#include <sys/vfs.h>
#include "hostfs.h"
#include "kern_util.h"
#include "os.h"
#include "user.h"
#include <utime.h>
int stat_file(const char *path, unsigned long long *inode_out, int *mode_out,
int *nlink_out, int *uid_out, int *gid_out,
......@@ -25,33 +27,41 @@ int stat_file(const char *path, unsigned long long *inode_out, int *mode_out,
{
struct stat64 buf;
if(fd >= 0) {
if (fd >= 0) {
if (fstat64(fd, &buf) < 0)
return -errno;
} else if(lstat64(path, &buf) < 0) {
} else if (lstat64(path, &buf) < 0) {
return -errno;
}
if(inode_out != NULL) *inode_out = buf.st_ino;
if(mode_out != NULL) *mode_out = buf.st_mode;
if(nlink_out != NULL) *nlink_out = buf.st_nlink;
if(uid_out != NULL) *uid_out = buf.st_uid;
if(gid_out != NULL) *gid_out = buf.st_gid;
if(size_out != NULL) *size_out = buf.st_size;
if(atime_out != NULL) {
if (inode_out != NULL)
*inode_out = buf.st_ino;
if (mode_out != NULL)
*mode_out = buf.st_mode;
if (nlink_out != NULL)
*nlink_out = buf.st_nlink;
if (uid_out != NULL)
*uid_out = buf.st_uid;
if (gid_out != NULL)
*gid_out = buf.st_gid;
if (size_out != NULL)
*size_out = buf.st_size;
if (atime_out != NULL) {
atime_out->tv_sec = buf.st_atime;
atime_out->tv_nsec = 0;
}
if(mtime_out != NULL) {
if (mtime_out != NULL) {
mtime_out->tv_sec = buf.st_mtime;
mtime_out->tv_nsec = 0;
}
if(ctime_out != NULL) {
if (ctime_out != NULL) {
ctime_out->tv_sec = buf.st_ctime;
ctime_out->tv_nsec = 0;
}
if(blksize_out != NULL) *blksize_out = buf.st_blksize;
if(blocks_out != NULL) *blocks_out = buf.st_blocks;
if (blksize_out != NULL)
*blksize_out = buf.st_blksize;
if (blocks_out != NULL)
*blocks_out = buf.st_blocks;
return 0;
}
......@@ -59,21 +69,29 @@ int file_type(const char *path, int *maj, int *min)
{
struct stat64 buf;
if(lstat64(path, &buf) < 0)
if (lstat64(path, &buf) < 0)
return -errno;
/*We cannot pass rdev as is because glibc and the kernel disagree
*about its definition.*/
if(maj != NULL)
/*
* We cannot pass rdev as is because glibc and the kernel disagree
* about its definition.
*/
if (maj != NULL)
*maj = major(buf.st_rdev);
if(min != NULL)
if (min != NULL)
*min = minor(buf.st_rdev);
if(S_ISDIR(buf.st_mode)) return OS_TYPE_DIR;
else if(S_ISLNK(buf.st_mode)) return OS_TYPE_SYMLINK;
else if(S_ISCHR(buf.st_mode)) return OS_TYPE_CHARDEV;
else if(S_ISBLK(buf.st_mode)) return OS_TYPE_BLOCKDEV;
else if(S_ISFIFO(buf.st_mode))return OS_TYPE_FIFO;
else if(S_ISSOCK(buf.st_mode))return OS_TYPE_SOCK;
if (S_ISDIR(buf.st_mode))
return OS_TYPE_DIR;
else if (S_ISLNK(buf.st_mode))
return OS_TYPE_SYMLINK;
else if (S_ISCHR(buf.st_mode))
return OS_TYPE_CHARDEV;
else if (S_ISBLK(buf.st_mode))
return OS_TYPE_BLOCKDEV;
else if (S_ISFIFO(buf.st_mode))
return OS_TYPE_FIFO;
else if (S_ISSOCK(buf.st_mode))
return OS_TYPE_SOCK;
else return OS_TYPE_FILE;
}
......@@ -81,10 +99,13 @@ int access_file(char *path, int r, int w, int x)
{
int mode = 0;
if(r) mode = R_OK;
if(w) mode |= W_OK;
if(x) mode |= X_OK;
if(access(path, mode) != 0)
if (r)
mode = R_OK;
if (w)
mode |= W_OK;
if (x)
mode |= X_OK;
if (access(path, mode) != 0)
return -errno;
else return 0;
}
......@@ -93,18 +114,18 @@ int open_file(char *path, int r, int w, int append)
{
int mode = 0, fd;
if(r && !w)
if (r && !w)
mode = O_RDONLY;
else if(!r && w)
else if (!r && w)
mode = O_WRONLY;
else if(r && w)
else if (r && w)
mode = O_RDWR;
else panic("Impossible mode in open_file");
if(append)
if (append)
mode |= O_APPEND;
fd = open64(path, mode);
if(fd < 0)
if (fd < 0)
return -errno;
else return fd;
}
......@@ -115,7 +136,7 @@ void *open_dir(char *path, int *err_out)
dir = opendir(path);
*err_out = errno;
if(dir == NULL)
if (dir == NULL)
return NULL;
return dir;
}
......@@ -128,7 +149,7 @@ char *read_dir(void *stream, unsigned long long *pos,
seekdir(dir, *pos);
ent = readdir(dir);
if(ent == NULL)
if (ent == NULL)
return NULL;
*len_out = strlen(ent->d_name);
*ino_out = ent->d_ino;
......@@ -141,7 +162,7 @@ int read_file(int fd, unsigned long long *offset, char *buf, int len)
int n;
n = pread64(fd, buf, len, *offset);
if(n < 0)
if (n < 0)
return -errno;
*offset += n;
return n;
......@@ -152,7 +173,7 @@ int write_file(int fd, unsigned long long *offset, const char *buf, int len)
int n;
n = pwrite64(fd, buf, len, *offset);
if(n < 0)
if (n < 0)
return -errno;
*offset += n;
return n;
......@@ -163,7 +184,7 @@ int lseek_file(int fd, long long offset, int whence)
int ret;
ret = lseek64(fd, offset, whence);
if(ret < 0)
if (ret < 0)
return -errno;
return 0;
}
......@@ -207,7 +228,7 @@ int file_create(char *name, int ur, int uw, int ux, int gr,
mode |= ow ? S_IWOTH : 0;
mode |= ox ? S_IXOTH : 0;
fd = open64(name, O_CREAT | O_RDWR, mode);
if(fd < 0)
if (fd < 0)
return -errno;
return fd;
}
......@@ -230,7 +251,7 @@ int set_attr(const char *file, struct hostfs_iattr *attrs, int fd)
if (fd >= 0) {
if (fchown(fd, attrs->ia_uid, -1))
return -errno;
} else if(chown(file, attrs->ia_uid, -1)) {
} else if (chown(file, attrs->ia_uid, -1)) {
return -errno;
}
}
......@@ -251,9 +272,11 @@ int set_attr(const char *file, struct hostfs_iattr *attrs, int fd)
}
}
/* Update accessed and/or modified time, in two parts: first set
/*
* Update accessed and/or modified time, in two parts: first set
* times according to the changes to perform, and then call futimes()
* or utimes() to apply them. */
* or utimes() to apply them.
*/
ma = (HOSTFS_ATTR_ATIME_SET | HOSTFS_ATTR_MTIME_SET);
if (attrs->ia_valid & ma) {
err = stat_file(file, NULL, NULL, NULL, NULL, NULL, NULL,
......@@ -284,11 +307,11 @@ int set_attr(const char *file, struct hostfs_iattr *attrs, int fd)
}
/* Note: ctime is not handled */
if(attrs->ia_valid & (HOSTFS_ATTR_ATIME | HOSTFS_ATTR_MTIME)){
if (attrs->ia_valid & (HOSTFS_ATTR_ATIME | HOSTFS_ATTR_MTIME)) {
err = stat_file(file, NULL, NULL, NULL, NULL, NULL, NULL,
&attrs->ia_atime, &attrs->ia_mtime, NULL,
NULL, NULL, fd);
if(err != 0)
if (err != 0)
return err;
}
return 0;
......@@ -299,7 +322,7 @@ int make_symlink(const char *from, const char *to)
int err;
err = symlink(to, from);
if(err)
if (err)
return -errno;
return 0;
}
......@@ -309,7 +332,7 @@ int unlink_file(const char *file)
int err;
err = unlink(file);
if(err)
if (err)
return -errno;
return 0;
}
......@@ -319,7 +342,7 @@ int do_mkdir(const char *file, int mode)
int err;
err = mkdir(file, mode);
if(err)
if (err)
return -errno;
return 0;
}
......@@ -329,7 +352,7 @@ int do_rmdir(const char *file)
int err;
err = rmdir(file);
if(err)
if (err)
return -errno;
return 0;
}
......@@ -339,7 +362,7 @@ int do_mknod(const char *file, int mode, unsigned int major, unsigned int minor)
int err;
err = mknod(file, mode, makedev(major, minor));
if(err)
if (err)
return -errno;
return 0;
}
......@@ -349,7 +372,7 @@ int link_file(const char *to, const char *from)
int err;
err = link(to, from);
if(err)
if (err)
return -errno;
return 0;
}
......@@ -359,9 +382,9 @@ int do_readlink(char *file, char *buf, int size)
int n;
n = readlink(file, buf, size);
if(n < 0)
if (n < 0)
return -errno;
if(n < size)
if (n < size)
buf[n] = '\0';
return n;
}
......@@ -371,7 +394,7 @@ int rename_file(char *from, char *to)
int err;
err = rename(from, to);
if(err < 0)
if (err < 0)
return -errno;
return 0;
}
......@@ -386,7 +409,7 @@ int do_statfs(char *root, long *bsize_out, long long *blocks_out,
int err;
err = statfs64(root, &buf);
if(err < 0)
if (err < 0)
return -errno;
*bsize_out = buf.f_bsize;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment