diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-09 22:15:20 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-09 22:15:20 -0400 |
commit | f59b51fe3d3092c08d7d554ecb40db24011b2ebc (patch) | |
tree | f19a5cb72adda3963f83609dbe2314620a4cf63e /fs/hostfs | |
parent | aac2b1f5747ea34696d0da5bdc4d8247aa6437af (diff) | |
parent | 062d52672446014222942cae6934d97769b329f0 (diff) |
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/hostfs')
-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 |
3 files changed, 8 insertions, 7 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 @@ | |||
1 | #ifndef __UM_FS_HOSTFS | 1 | #ifndef __UM_FS_HOSTFS |
2 | #define __UM_FS_HOSTFS | 2 | #define __UM_FS_HOSTFS |
3 | 3 | ||
4 | #include "os.h" | 4 | #include <os.h> |
5 | 5 | ||
6 | /* | 6 | /* |
7 | * These are exactly the same definitions as in fs.h, but the names are | 7 | * 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 @@ | |||
16 | #include <linux/mount.h> | 16 | #include <linux/mount.h> |
17 | #include <linux/namei.h> | 17 | #include <linux/namei.h> |
18 | #include "hostfs.h" | 18 | #include "hostfs.h" |
19 | #include "init.h" | 19 | #include <init.h> |
20 | #include "kern.h" | 20 | #include <kern.h> |
21 | 21 | ||
22 | struct hostfs_inode_info { | 22 | struct hostfs_inode_info { |
23 | int fd; | 23 | int fd; |
@@ -848,9 +848,11 @@ int hostfs_setattr(struct dentry *dentry, struct iattr *attr) | |||
848 | attr->ia_size != i_size_read(inode)) { | 848 | attr->ia_size != i_size_read(inode)) { |
849 | int error; | 849 | int error; |
850 | 850 | ||
851 | error = vmtruncate(inode, attr->ia_size); | 851 | error = inode_newsize_ok(inode, attr->ia_size); |
852 | if (err) | 852 | if (error) |
853 | return err; | 853 | return error; |
854 | |||
855 | truncate_setsize(inode, attr->ia_size); | ||
854 | } | 856 | } |
855 | 857 | ||
856 | setattr_copy(inode, attr); | 858 | 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 @@ | |||
15 | #include <sys/types.h> | 15 | #include <sys/types.h> |
16 | #include <sys/vfs.h> | 16 | #include <sys/vfs.h> |
17 | #include "hostfs.h" | 17 | #include "hostfs.h" |
18 | #include "os.h" | ||
19 | #include <utime.h> | 18 | #include <utime.h> |
20 | 19 | ||
21 | static void stat64_to_hostfs(const struct stat64 *buf, struct hostfs_stat *p) | 20 | static void stat64_to_hostfs(const struct stat64 *buf, struct hostfs_stat *p) |