diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-10 11:15:20 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-10 11:15:20 +0900 |
| commit | f59b51fe3d3092c08d7d554ecb40db24011b2ebc (patch) | |
| tree | f19a5cb72adda3963f83609dbe2314620a4cf63e /fs | |
| parent | aac2b1f5747ea34696d0da5bdc4d8247aa6437af (diff) | |
| parent | 062d52672446014222942cae6934d97769b329f0 (diff) | |
| download | linux-f59b51fe3d3092c08d7d554ecb40db24011b2ebc.tar.gz linux-f59b51fe3d3092c08d7d554ecb40db24011b2ebc.tar.bz2 linux-f59b51fe3d3092c08d7d554ecb40db24011b2ebc.zip | |
Merge branch 'for-linus-37rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml
Pull UML changes from Richard Weinberger:
"UML receives this time only cleanups.
The most outstanding change is the 'include "foo.h"' do 'include
<foo.h>' conversion done by Al Viro.
It touches many files, that's why the diffstat is rather big."
* 'for-linus-37rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
typo in UserModeLinux-HOWTO
hppfs: fix the return value of get_inode()
hostfs: drop vmtruncate
um: get rid of pointless include "..." where include <...> will do
um: move sysrq.h out of include/shared
um/x86: merge 32 and 64 bit variants of ptrace.h
um/x86: merge 32 and 64bit variants of checksum.h
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/hostfs/hostfs.h | 2 | ||||
| -rw-r--r-- | fs/hostfs/hostfs_kern.c | 12 | ||||
| -rw-r--r-- | fs/hostfs/hostfs_user.c | 1 | ||||
| -rw-r--r-- | fs/hppfs/hppfs.c | 4 |
4 files changed, 10 insertions, 9 deletions
diff --git a/fs/hostfs/hostfs.h b/fs/hostfs/hostfs.h index 1fe731337f07..9c88da0e855a 100644 --- a/fs/hostfs/hostfs.h +++ b/fs/hostfs/hostfs.h @@ -1,7 +1,7 @@ #ifndef __UM_FS_HOSTFS #define __UM_FS_HOSTFS -#include "os.h" +#include <os.h> /* * These are exactly the same definitions as in fs.h, but the names are diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c index 6c9f3a9d5e21..457addc5c91f 100644 --- a/fs/hostfs/hostfs_kern.c +++ b/fs/hostfs/hostfs_kern.c @@ -16,8 +16,8 @@ #include <linux/mount.h> #include <linux/namei.h> #include "hostfs.h" -#include "init.h" -#include "kern.h" +#include <init.h> +#include <kern.h> struct hostfs_inode_info { int fd; @@ -848,9 +848,11 @@ int hostfs_setattr(struct dentry *dentry, struct iattr *attr) attr->ia_size != i_size_read(inode)) { int error; - error = vmtruncate(inode, attr->ia_size); - if (err) - return err; + error = inode_newsize_ok(inode, attr->ia_size); + if (error) + return error; + + truncate_setsize(inode, attr->ia_size); } setattr_copy(inode, attr); diff --git a/fs/hostfs/hostfs_user.c b/fs/hostfs/hostfs_user.c index a74ad0d371c2..67838f3aa20a 100644 --- a/fs/hostfs/hostfs_user.c +++ b/fs/hostfs/hostfs_user.c @@ -15,7 +15,6 @@ #include <sys/types.h> #include <sys/vfs.h> #include "hostfs.h" -#include "os.h" #include <utime.h> static void stat64_to_hostfs(const struct stat64 *buf, struct hostfs_stat *p) diff --git a/fs/hppfs/hppfs.c b/fs/hppfs/hppfs.c index c1dffe47fde2..78f21f8dc2ec 100644 --- a/fs/hppfs/hppfs.c +++ b/fs/hppfs/hppfs.c @@ -18,7 +18,7 @@ #include <linux/pid_namespace.h> #include <linux/namei.h> #include <asm/uaccess.h> -#include "os.h" +#include <os.h> static struct inode *get_inode(struct super_block *, struct dentry *); @@ -674,7 +674,7 @@ static struct inode *get_inode(struct super_block *sb, struct dentry *dentry) if (!inode) { dput(dentry); - return ERR_PTR(-ENOMEM); + return NULL; } if (S_ISDIR(dentry->d_inode->i_mode)) { |