diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-10 11:26:52 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-10 11:26:52 -0700 |
| commit | 5f248c9c251c60af3403902b26e08de43964ea0b (patch) | |
| tree | 6d3328e72a7e4015a64017eb30be18095c6a3c64 /arch/s390 | |
| parent | f6cec0ae58c17522a7bc4e2f39dae19f199ab534 (diff) | |
| parent | dca332528bc69e05f67161e1ed59929633d5e63d (diff) | |
| download | op-kernel-dev-5f248c9c251c60af3403902b26e08de43964ea0b.zip op-kernel-dev-5f248c9c251c60af3403902b26e08de43964ea0b.tar.gz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: (96 commits)
no need for list_for_each_entry_safe()/resetting with superblock list
Fix sget() race with failing mount
vfs: don't hold s_umount over close_bdev_exclusive() call
sysv: do not mark superblock dirty on remount
sysv: do not mark superblock dirty on mount
btrfs: remove junk sb_dirt change
BFS: clean up the superblock usage
AFFS: wait for sb synchronization when needed
AFFS: clean up dirty flag usage
cifs: truncate fallout
mbcache: fix shrinker function return value
mbcache: Remove unused features
add f_flags to struct statfs(64)
pass a struct path to vfs_statfs
update VFS documentation for method changes.
All filesystems that need invalidate_inode_buffers() are doing that explicitly
convert remaining ->clear_inode() to ->evict_inode()
Make ->drop_inode() just return whether inode needs to be dropped
fs/inode.c:clear_inode() is gone
fs/inode.c:evict() doesn't care about delete vs. non-delete paths now
...
Fix up trivial conflicts in fs/nilfs2/super.c
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/hypfs/inode.c | 6 | ||||
| -rw-r--r-- | arch/s390/include/asm/statfs.h | 9 |
2 files changed, 9 insertions, 6 deletions
diff --git a/arch/s390/hypfs/inode.c b/arch/s390/hypfs/inode.c index 6b120f0..98a4a4c 100644 --- a/arch/s390/hypfs/inode.c +++ b/arch/s390/hypfs/inode.c @@ -117,10 +117,10 @@ static struct inode *hypfs_make_inode(struct super_block *sb, int mode) return ret; } -static void hypfs_drop_inode(struct inode *inode) +static void hypfs_evict_inode(struct inode *inode) { + end_writeback(inode); kfree(inode->i_private); - generic_delete_inode(inode); } static int hypfs_open(struct inode *inode, struct file *filp) @@ -460,7 +460,7 @@ static struct file_system_type hypfs_type = { static const struct super_operations hypfs_s_ops = { .statfs = simple_statfs, - .drop_inode = hypfs_drop_inode, + .evict_inode = hypfs_evict_inode, .show_options = hypfs_show_options, }; diff --git a/arch/s390/include/asm/statfs.h b/arch/s390/include/asm/statfs.h index 06cc703..3be7fbd 100644 --- a/arch/s390/include/asm/statfs.h +++ b/arch/s390/include/asm/statfs.h @@ -33,7 +33,8 @@ struct statfs { __kernel_fsid_t f_fsid; int f_namelen; int f_frsize; - int f_spare[5]; + int f_flags; + int f_spare[4]; }; struct statfs64 { @@ -47,7 +48,8 @@ struct statfs64 { __kernel_fsid_t f_fsid; int f_namelen; int f_frsize; - int f_spare[5]; + int f_flags; + int f_spare[4]; }; struct compat_statfs64 { @@ -61,7 +63,8 @@ struct compat_statfs64 { __kernel_fsid_t f_fsid; __u32 f_namelen; __u32 f_frsize; - __u32 f_spare[5]; + __u32 f_flags; + __u32 f_spare[4]; }; #endif /* __s390x__ */ |
