Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml
Pull UML changes from Richard Weinberger: "This time only various cleanups and housekeeping patches" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml: um: hostfs: make functions static um: Include generic barrier.h um: Removed unused attributes from thread_struct
This commit is contained in:
Linus Torvalds
Коммит
77d143de75
|
|
@ -5,3 +5,4 @@ generic-y += switch_to.h clkdev.h
|
|||
generic-y += trace_clock.h
|
||||
generic-y += preempt.h
|
||||
generic-y += hash.h
|
||||
generic-y += barrier.h
|
||||
|
|
|
|||
|
|
@ -25,10 +25,8 @@ struct thread_struct {
|
|||
void *fault_addr;
|
||||
jmp_buf *fault_catcher;
|
||||
struct task_struct *prev_sched;
|
||||
unsigned long temp_stack;
|
||||
struct arch_thread arch;
|
||||
jmp_buf switch_buf;
|
||||
int mm_count;
|
||||
struct {
|
||||
int op;
|
||||
union {
|
||||
|
|
@ -52,7 +50,6 @@ struct thread_struct {
|
|||
.regs = EMPTY_REGS, \
|
||||
.fault_addr = NULL, \
|
||||
.prev_sched = NULL, \
|
||||
.temp_stack = 0, \
|
||||
.arch = INIT_ARCH_THREAD, \
|
||||
.request = { 0 } \
|
||||
}
|
||||
|
|
|
|||
|
|
@ -186,7 +186,7 @@ static struct inode *hostfs_iget(struct super_block *sb)
|
|||
return inode;
|
||||
}
|
||||
|
||||
int hostfs_statfs(struct dentry *dentry, struct kstatfs *sf)
|
||||
static int hostfs_statfs(struct dentry *dentry, struct kstatfs *sf)
|
||||
{
|
||||
/*
|
||||
* do_statfs uses struct statfs64 internally, but the linux kernel
|
||||
|
|
@ -268,7 +268,7 @@ static const struct super_operations hostfs_sbops = {
|
|||
.show_options = hostfs_show_options,
|
||||
};
|
||||
|
||||
int hostfs_readdir(struct file *file, struct dir_context *ctx)
|
||||
static int hostfs_readdir(struct file *file, struct dir_context *ctx)
|
||||
{
|
||||
void *dir;
|
||||
char *name;
|
||||
|
|
@ -293,7 +293,7 @@ int hostfs_readdir(struct file *file, struct dir_context *ctx)
|
|||
return 0;
|
||||
}
|
||||
|
||||
int hostfs_file_open(struct inode *ino, struct file *file)
|
||||
static int hostfs_file_open(struct inode *ino, struct file *file)
|
||||
{
|
||||
static DEFINE_MUTEX(open_mutex);
|
||||
char *name;
|
||||
|
|
@ -359,7 +359,8 @@ static int hostfs_file_release(struct inode *inode, struct file *file)
|
|||
return 0;
|
||||
}
|
||||
|
||||
int hostfs_fsync(struct file *file, loff_t start, loff_t end, int datasync)
|
||||
static int hostfs_fsync(struct file *file, loff_t start, loff_t end,
|
||||
int datasync)
|
||||
{
|
||||
struct inode *inode = file->f_mapping->host;
|
||||
int ret;
|
||||
|
|
@ -394,7 +395,7 @@ static const struct file_operations hostfs_dir_fops = {
|
|||
.read = generic_read_dir,
|
||||
};
|
||||
|
||||
int hostfs_writepage(struct page *page, struct writeback_control *wbc)
|
||||
static int hostfs_writepage(struct page *page, struct writeback_control *wbc)
|
||||
{
|
||||
struct address_space *mapping = page->mapping;
|
||||
struct inode *inode = mapping->host;
|
||||
|
|
@ -430,7 +431,7 @@ int hostfs_writepage(struct page *page, struct writeback_control *wbc)
|
|||
return err;
|
||||
}
|
||||
|
||||
int hostfs_readpage(struct file *file, struct page *page)
|
||||
static int hostfs_readpage(struct file *file, struct page *page)
|
||||
{
|
||||
char *buffer;
|
||||
long long start;
|
||||
|
|
@ -455,9 +456,9 @@ int hostfs_readpage(struct file *file, struct page *page)
|
|||
return err;
|
||||
}
|
||||
|
||||
int hostfs_write_begin(struct file *file, struct address_space *mapping,
|
||||
loff_t pos, unsigned len, unsigned flags,
|
||||
struct page **pagep, void **fsdata)
|
||||
static int hostfs_write_begin(struct file *file, struct address_space *mapping,
|
||||
loff_t pos, unsigned len, unsigned flags,
|
||||
struct page **pagep, void **fsdata)
|
||||
{
|
||||
pgoff_t index = pos >> PAGE_CACHE_SHIFT;
|
||||
|
||||
|
|
@ -467,9 +468,9 @@ int hostfs_write_begin(struct file *file, struct address_space *mapping,
|
|||
return 0;
|
||||
}
|
||||
|
||||
int hostfs_write_end(struct file *file, struct address_space *mapping,
|
||||
loff_t pos, unsigned len, unsigned copied,
|
||||
struct page *page, void *fsdata)
|
||||
static int hostfs_write_end(struct file *file, struct address_space *mapping,
|
||||
loff_t pos, unsigned len, unsigned copied,
|
||||
struct page *page, void *fsdata)
|
||||
{
|
||||
struct inode *inode = mapping->host;
|
||||
void *buffer;
|
||||
|
|
@ -549,8 +550,8 @@ static int read_name(struct inode *ino, char *name)
|
|||
return 0;
|
||||
}
|
||||
|
||||
int hostfs_create(struct inode *dir, struct dentry *dentry, umode_t mode,
|
||||
bool excl)
|
||||
static int hostfs_create(struct inode *dir, struct dentry *dentry, umode_t mode,
|
||||
bool excl)
|
||||
{
|
||||
struct inode *inode;
|
||||
char *name;
|
||||
|
|
@ -591,8 +592,8 @@ int hostfs_create(struct inode *dir, struct dentry *dentry, umode_t mode,
|
|||
return error;
|
||||
}
|
||||
|
||||
struct dentry *hostfs_lookup(struct inode *ino, struct dentry *dentry,
|
||||
unsigned int flags)
|
||||
static struct dentry *hostfs_lookup(struct inode *ino, struct dentry *dentry,
|
||||
unsigned int flags)
|
||||
{
|
||||
struct inode *inode;
|
||||
char *name;
|
||||
|
|
@ -628,7 +629,8 @@ struct dentry *hostfs_lookup(struct inode *ino, struct dentry *dentry,
|
|||
return ERR_PTR(err);
|
||||
}
|
||||
|
||||
int hostfs_link(struct dentry *to, struct inode *ino, struct dentry *from)
|
||||
static int hostfs_link(struct dentry *to, struct inode *ino,
|
||||
struct dentry *from)
|
||||
{
|
||||
char *from_name, *to_name;
|
||||
int err;
|
||||
|
|
@ -646,7 +648,7 @@ int hostfs_link(struct dentry *to, struct inode *ino, struct dentry *from)
|
|||
return err;
|
||||
}
|
||||
|
||||
int hostfs_unlink(struct inode *ino, struct dentry *dentry)
|
||||
static int hostfs_unlink(struct inode *ino, struct dentry *dentry)
|
||||
{
|
||||
char *file;
|
||||
int err;
|
||||
|
|
@ -662,7 +664,8 @@ int hostfs_unlink(struct inode *ino, struct dentry *dentry)
|
|||
return err;
|
||||
}
|
||||
|
||||
int hostfs_symlink(struct inode *ino, struct dentry *dentry, const char *to)
|
||||
static int hostfs_symlink(struct inode *ino, struct dentry *dentry,
|
||||
const char *to)
|
||||
{
|
||||
char *file;
|
||||
int err;
|
||||
|
|
@ -674,7 +677,7 @@ int hostfs_symlink(struct inode *ino, struct dentry *dentry, const char *to)
|
|||
return err;
|
||||
}
|
||||
|
||||
int hostfs_mkdir(struct inode *ino, struct dentry *dentry, umode_t mode)
|
||||
static int hostfs_mkdir(struct inode *ino, struct dentry *dentry, umode_t mode)
|
||||
{
|
||||
char *file;
|
||||
int err;
|
||||
|
|
@ -686,7 +689,7 @@ int hostfs_mkdir(struct inode *ino, struct dentry *dentry, umode_t mode)
|
|||
return err;
|
||||
}
|
||||
|
||||
int hostfs_rmdir(struct inode *ino, struct dentry *dentry)
|
||||
static int hostfs_rmdir(struct inode *ino, struct dentry *dentry)
|
||||
{
|
||||
char *file;
|
||||
int err;
|
||||
|
|
@ -738,8 +741,8 @@ static int hostfs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode,
|
|||
return err;
|
||||
}
|
||||
|
||||
int hostfs_rename(struct inode *from_ino, struct dentry *from,
|
||||
struct inode *to_ino, struct dentry *to)
|
||||
static int hostfs_rename(struct inode *from_ino, struct dentry *from,
|
||||
struct inode *to_ino, struct dentry *to)
|
||||
{
|
||||
char *from_name, *to_name;
|
||||
int err;
|
||||
|
|
@ -756,7 +759,7 @@ int hostfs_rename(struct inode *from_ino, struct dentry *from,
|
|||
return err;
|
||||
}
|
||||
|
||||
int hostfs_permission(struct inode *ino, int desired)
|
||||
static int hostfs_permission(struct inode *ino, int desired)
|
||||
{
|
||||
char *name;
|
||||
int r = 0, w = 0, x = 0, err;
|
||||
|
|
@ -782,7 +785,7 @@ int hostfs_permission(struct inode *ino, int desired)
|
|||
return err;
|
||||
}
|
||||
|
||||
int hostfs_setattr(struct dentry *dentry, struct iattr *attr)
|
||||
static int hostfs_setattr(struct dentry *dentry, struct iattr *attr)
|
||||
{
|
||||
struct inode *inode = dentry->d_inode;
|
||||
struct hostfs_iattr attrs;
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче