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
This commit is contained in:
Linus Torvalds
commit
5f248c9c25
205 changed files with 2594 additions and 2485 deletions
|
|
@ -203,12 +203,10 @@ int block_write_full_page_endio(struct page *page, get_block_t *get_block,
|
|||
int block_read_full_page(struct page*, get_block_t*);
|
||||
int block_is_partially_uptodate(struct page *page, read_descriptor_t *desc,
|
||||
unsigned long from);
|
||||
int block_write_begin_newtrunc(struct file *, struct address_space *,
|
||||
loff_t, unsigned, unsigned,
|
||||
struct page **, void **, get_block_t*);
|
||||
int block_write_begin(struct file *, struct address_space *,
|
||||
loff_t, unsigned, unsigned,
|
||||
struct page **, void **, get_block_t*);
|
||||
int block_write_begin(struct address_space *mapping, loff_t pos, unsigned len,
|
||||
unsigned flags, struct page **pagep, get_block_t *get_block);
|
||||
int __block_write_begin(struct page *page, loff_t pos, unsigned len,
|
||||
get_block_t *get_block);
|
||||
int block_write_end(struct file *, struct address_space *,
|
||||
loff_t, unsigned, unsigned,
|
||||
struct page *, void *);
|
||||
|
|
@ -217,9 +215,6 @@ int generic_write_end(struct file *, struct address_space *,
|
|||
struct page *, void *);
|
||||
void page_zero_new_buffers(struct page *page, unsigned from, unsigned to);
|
||||
int block_prepare_write(struct page*, unsigned, unsigned, get_block_t*);
|
||||
int cont_write_begin_newtrunc(struct file *, struct address_space *, loff_t,
|
||||
unsigned, unsigned, struct page **, void **,
|
||||
get_block_t *, loff_t *);
|
||||
int cont_write_begin(struct file *, struct address_space *, loff_t,
|
||||
unsigned, unsigned, struct page **, void **,
|
||||
get_block_t *, loff_t *);
|
||||
|
|
@ -230,12 +225,7 @@ int block_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf,
|
|||
void block_sync_page(struct page *);
|
||||
sector_t generic_block_bmap(struct address_space *, sector_t, get_block_t *);
|
||||
int block_truncate_page(struct address_space *, loff_t, get_block_t *);
|
||||
int file_fsync(struct file *, int);
|
||||
int nobh_write_begin_newtrunc(struct file *, struct address_space *,
|
||||
loff_t, unsigned, unsigned,
|
||||
struct page **, void **, get_block_t*);
|
||||
int nobh_write_begin(struct file *, struct address_space *,
|
||||
loff_t, unsigned, unsigned,
|
||||
int nobh_write_begin(struct address_space *, loff_t, unsigned, unsigned,
|
||||
struct page **, void **, get_block_t*);
|
||||
int nobh_write_end(struct file *, struct address_space *,
|
||||
loff_t, unsigned, unsigned,
|
||||
|
|
|
|||
|
|
@ -315,6 +315,7 @@ extern char *dynamic_dname(struct dentry *, char *, int, const char *, ...);
|
|||
|
||||
extern char *__d_path(const struct path *path, struct path *root, char *, int);
|
||||
extern char *d_path(const struct path *, char *, int);
|
||||
extern char *__dentry_path(struct dentry *, char *, int);
|
||||
extern char *dentry_path(struct dentry *, char *, int);
|
||||
|
||||
/* Allocation counts.. */
|
||||
|
|
|
|||
|
|
@ -895,7 +895,7 @@ int ext3_get_blocks_handle(handle_t *handle, struct inode *inode,
|
|||
extern struct inode *ext3_iget(struct super_block *, unsigned long);
|
||||
extern int ext3_write_inode (struct inode *, struct writeback_control *);
|
||||
extern int ext3_setattr (struct dentry *, struct iattr *);
|
||||
extern void ext3_delete_inode (struct inode *);
|
||||
extern void ext3_evict_inode (struct inode *);
|
||||
extern int ext3_sync_inode (handle_t *, struct inode *);
|
||||
extern void ext3_discard_reservation (struct inode *);
|
||||
extern void ext3_dirty_inode(struct inode *);
|
||||
|
|
|
|||
|
|
@ -210,6 +210,7 @@ struct inodes_stat_t {
|
|||
#define MS_KERNMOUNT (1<<22) /* this is a kern_mount call */
|
||||
#define MS_I_VERSION (1<<23) /* Update inode I_version field */
|
||||
#define MS_STRICTATIME (1<<24) /* Always perform atime updates */
|
||||
#define MS_BORN (1<<29)
|
||||
#define MS_ACTIVE (1<<30)
|
||||
#define MS_NOUSER (1<<31)
|
||||
|
||||
|
|
@ -1564,8 +1565,8 @@ struct super_operations {
|
|||
|
||||
void (*dirty_inode) (struct inode *);
|
||||
int (*write_inode) (struct inode *, struct writeback_control *wbc);
|
||||
void (*drop_inode) (struct inode *);
|
||||
void (*delete_inode) (struct inode *);
|
||||
int (*drop_inode) (struct inode *);
|
||||
void (*evict_inode) (struct inode *);
|
||||
void (*put_super) (struct super_block *);
|
||||
void (*write_super) (struct super_block *);
|
||||
int (*sync_fs)(struct super_block *sb, int wait);
|
||||
|
|
@ -1573,7 +1574,6 @@ struct super_operations {
|
|||
int (*unfreeze_fs) (struct super_block *);
|
||||
int (*statfs) (struct dentry *, struct kstatfs *);
|
||||
int (*remount_fs) (struct super_block *, int *, char *);
|
||||
void (*clear_inode) (struct inode *);
|
||||
void (*umount_begin) (struct super_block *);
|
||||
|
||||
int (*show_options)(struct seq_file *, struct vfsmount *);
|
||||
|
|
@ -1618,8 +1618,8 @@ struct super_operations {
|
|||
* I_FREEING Set when inode is about to be freed but still has dirty
|
||||
* pages or buffers attached or the inode itself is still
|
||||
* dirty.
|
||||
* I_CLEAR Set by clear_inode(). In this state the inode is clean
|
||||
* and can be destroyed.
|
||||
* I_CLEAR Added by end_writeback(). In this state the inode is clean
|
||||
* and can be destroyed. Inode keeps I_FREEING.
|
||||
*
|
||||
* Inodes that are I_WILL_FREE, I_FREEING or I_CLEAR are
|
||||
* prohibited for many purposes. iget() must wait for
|
||||
|
|
@ -1816,7 +1816,8 @@ extern struct vfsmount *collect_mounts(struct path *);
|
|||
extern void drop_collected_mounts(struct vfsmount *);
|
||||
extern int iterate_mounts(int (*)(struct vfsmount *, void *), void *,
|
||||
struct vfsmount *);
|
||||
extern int vfs_statfs(struct dentry *, struct kstatfs *);
|
||||
extern int vfs_statfs(struct path *, struct kstatfs *);
|
||||
extern int statfs_by_dentry(struct dentry *, struct kstatfs *);
|
||||
extern int freeze_super(struct super_block *super);
|
||||
extern int thaw_super(struct super_block *super);
|
||||
|
||||
|
|
@ -2166,9 +2167,8 @@ extern void iput(struct inode *);
|
|||
extern struct inode * igrab(struct inode *);
|
||||
extern ino_t iunique(struct super_block *, ino_t);
|
||||
extern int inode_needs_sync(struct inode *inode);
|
||||
extern void generic_delete_inode(struct inode *inode);
|
||||
extern void generic_drop_inode(struct inode *inode);
|
||||
extern int generic_detach_inode(struct inode *inode);
|
||||
extern int generic_delete_inode(struct inode *inode);
|
||||
extern int generic_drop_inode(struct inode *inode);
|
||||
|
||||
extern struct inode *ilookup5_nowait(struct super_block *sb,
|
||||
unsigned long hashval, int (*test)(struct inode *, void *),
|
||||
|
|
@ -2185,7 +2185,7 @@ extern void unlock_new_inode(struct inode *);
|
|||
|
||||
extern void __iget(struct inode * inode);
|
||||
extern void iget_failed(struct inode *);
|
||||
extern void clear_inode(struct inode *);
|
||||
extern void end_writeback(struct inode *);
|
||||
extern void destroy_inode(struct inode *);
|
||||
extern void __destroy_inode(struct inode *);
|
||||
extern struct inode *new_inode(struct super_block *);
|
||||
|
|
@ -2271,16 +2271,6 @@ static inline int xip_truncate_page(struct address_space *mapping, loff_t from)
|
|||
struct bio;
|
||||
typedef void (dio_submit_t)(int rw, struct bio *bio, struct inode *inode,
|
||||
loff_t file_offset);
|
||||
void dio_end_io(struct bio *bio, int error);
|
||||
|
||||
ssize_t __blockdev_direct_IO_newtrunc(int rw, struct kiocb *iocb, struct inode *inode,
|
||||
struct block_device *bdev, const struct iovec *iov, loff_t offset,
|
||||
unsigned long nr_segs, get_block_t get_block, dio_iodone_t end_io,
|
||||
dio_submit_t submit_io, int lock_type);
|
||||
ssize_t __blockdev_direct_IO(int rw, struct kiocb *iocb, struct inode *inode,
|
||||
struct block_device *bdev, const struct iovec *iov, loff_t offset,
|
||||
unsigned long nr_segs, get_block_t get_block, dio_iodone_t end_io,
|
||||
dio_submit_t submit_io, int lock_type);
|
||||
|
||||
enum {
|
||||
/* need locking between buffered and direct access */
|
||||
|
|
@ -2290,24 +2280,13 @@ enum {
|
|||
DIO_SKIP_HOLES = 0x02,
|
||||
};
|
||||
|
||||
static inline ssize_t blockdev_direct_IO_newtrunc(int rw, struct kiocb *iocb,
|
||||
struct inode *inode, struct block_device *bdev, const struct iovec *iov,
|
||||
loff_t offset, unsigned long nr_segs, get_block_t get_block,
|
||||
dio_iodone_t end_io)
|
||||
{
|
||||
return __blockdev_direct_IO_newtrunc(rw, iocb, inode, bdev, iov, offset,
|
||||
nr_segs, get_block, end_io, NULL,
|
||||
DIO_LOCKING | DIO_SKIP_HOLES);
|
||||
}
|
||||
void dio_end_io(struct bio *bio, int error);
|
||||
|
||||
ssize_t __blockdev_direct_IO(int rw, struct kiocb *iocb, struct inode *inode,
|
||||
struct block_device *bdev, const struct iovec *iov, loff_t offset,
|
||||
unsigned long nr_segs, get_block_t get_block, dio_iodone_t end_io,
|
||||
dio_submit_t submit_io, int flags);
|
||||
|
||||
static inline ssize_t blockdev_direct_IO_no_locking_newtrunc(int rw, struct kiocb *iocb,
|
||||
struct inode *inode, struct block_device *bdev, const struct iovec *iov,
|
||||
loff_t offset, unsigned long nr_segs, get_block_t get_block,
|
||||
dio_iodone_t end_io)
|
||||
{
|
||||
return __blockdev_direct_IO_newtrunc(rw, iocb, inode, bdev, iov, offset,
|
||||
nr_segs, get_block, end_io, NULL, 0);
|
||||
}
|
||||
static inline ssize_t blockdev_direct_IO(int rw, struct kiocb *iocb,
|
||||
struct inode *inode, struct block_device *bdev, const struct iovec *iov,
|
||||
loff_t offset, unsigned long nr_segs, get_block_t get_block,
|
||||
|
|
@ -2317,15 +2296,6 @@ static inline ssize_t blockdev_direct_IO(int rw, struct kiocb *iocb,
|
|||
nr_segs, get_block, end_io, NULL,
|
||||
DIO_LOCKING | DIO_SKIP_HOLES);
|
||||
}
|
||||
|
||||
static inline ssize_t blockdev_direct_IO_no_locking(int rw, struct kiocb *iocb,
|
||||
struct inode *inode, struct block_device *bdev, const struct iovec *iov,
|
||||
loff_t offset, unsigned long nr_segs, get_block_t get_block,
|
||||
dio_iodone_t end_io)
|
||||
{
|
||||
return __blockdev_direct_IO(rw, iocb, inode, bdev, iov, offset,
|
||||
nr_segs, get_block, end_io, NULL, 0);
|
||||
}
|
||||
#endif
|
||||
|
||||
extern const struct file_operations generic_ro_fops;
|
||||
|
|
@ -2387,7 +2357,6 @@ extern int simple_link(struct dentry *, struct inode *, struct dentry *);
|
|||
extern int simple_unlink(struct inode *, struct dentry *);
|
||||
extern int simple_rmdir(struct inode *, struct dentry *);
|
||||
extern int simple_rename(struct inode *, struct dentry *, struct inode *, struct dentry *);
|
||||
extern int simple_setsize(struct inode *, loff_t);
|
||||
extern int noop_fsync(struct file *, int);
|
||||
extern int simple_empty(struct dentry *);
|
||||
extern int simple_readpage(struct file *file, struct page *page);
|
||||
|
|
@ -2424,8 +2393,7 @@ extern int buffer_migrate_page(struct address_space *,
|
|||
|
||||
extern int inode_change_ok(const struct inode *, struct iattr *);
|
||||
extern int inode_newsize_ok(const struct inode *, loff_t offset);
|
||||
extern int __must_check inode_setattr(struct inode *, const struct iattr *);
|
||||
extern void generic_setattr(struct inode *inode, const struct iattr *attr);
|
||||
extern void setattr_copy(struct inode *inode, const struct iattr *attr);
|
||||
|
||||
extern void file_update_time(struct file *file);
|
||||
|
||||
|
|
|
|||
|
|
@ -4,9 +4,6 @@
|
|||
(C) 2001 by Andreas Gruenbacher, <a.gruenbacher@computer.org>
|
||||
*/
|
||||
|
||||
/* Hardwire the number of additional indexes */
|
||||
#define MB_CACHE_INDEXES_COUNT 1
|
||||
|
||||
struct mb_cache_entry {
|
||||
struct list_head e_lru_list;
|
||||
struct mb_cache *e_cache;
|
||||
|
|
@ -18,17 +15,12 @@ struct mb_cache_entry {
|
|||
struct {
|
||||
struct list_head o_list;
|
||||
unsigned int o_key;
|
||||
} e_indexes[0];
|
||||
};
|
||||
|
||||
struct mb_cache_op {
|
||||
int (*free)(struct mb_cache_entry *, gfp_t);
|
||||
} e_index;
|
||||
};
|
||||
|
||||
/* Functions on caches */
|
||||
|
||||
struct mb_cache * mb_cache_create(const char *, struct mb_cache_op *, size_t,
|
||||
int, int);
|
||||
struct mb_cache *mb_cache_create(const char *, int);
|
||||
void mb_cache_shrink(struct block_device *);
|
||||
void mb_cache_destroy(struct mb_cache *);
|
||||
|
||||
|
|
@ -36,17 +28,15 @@ void mb_cache_destroy(struct mb_cache *);
|
|||
|
||||
struct mb_cache_entry *mb_cache_entry_alloc(struct mb_cache *, gfp_t);
|
||||
int mb_cache_entry_insert(struct mb_cache_entry *, struct block_device *,
|
||||
sector_t, unsigned int[]);
|
||||
sector_t, unsigned int);
|
||||
void mb_cache_entry_release(struct mb_cache_entry *);
|
||||
void mb_cache_entry_free(struct mb_cache_entry *);
|
||||
struct mb_cache_entry *mb_cache_entry_get(struct mb_cache *,
|
||||
struct block_device *,
|
||||
sector_t);
|
||||
#if !defined(MB_CACHE_INDEXES_COUNT) || (MB_CACHE_INDEXES_COUNT > 0)
|
||||
struct mb_cache_entry *mb_cache_entry_find_first(struct mb_cache *cache, int,
|
||||
struct mb_cache_entry *mb_cache_entry_find_first(struct mb_cache *cache,
|
||||
struct block_device *,
|
||||
unsigned int);
|
||||
struct mb_cache_entry *mb_cache_entry_find_next(struct mb_cache_entry *, int,
|
||||
struct mb_cache_entry *mb_cache_entry_find_next(struct mb_cache_entry *,
|
||||
struct block_device *,
|
||||
unsigned int);
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -815,6 +815,7 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping,
|
|||
}
|
||||
|
||||
extern void truncate_pagecache(struct inode *inode, loff_t old, loff_t new);
|
||||
extern void truncate_setsize(struct inode *inode, loff_t newsize);
|
||||
extern int vmtruncate(struct inode *inode, loff_t offset);
|
||||
extern int vmtruncate_range(struct inode *inode, loff_t offset, loff_t end);
|
||||
|
||||
|
|
|
|||
|
|
@ -2033,7 +2033,7 @@ void reiserfs_read_locked_inode(struct inode *inode,
|
|||
struct reiserfs_iget_args *args);
|
||||
int reiserfs_find_actor(struct inode *inode, void *p);
|
||||
int reiserfs_init_locked_inode(struct inode *inode, void *p);
|
||||
void reiserfs_delete_inode(struct inode *inode);
|
||||
void reiserfs_evict_inode(struct inode *inode);
|
||||
int reiserfs_write_inode(struct inode *inode, struct writeback_control *wbc);
|
||||
int reiserfs_get_block(struct inode *inode, sector_t block,
|
||||
struct buffer_head *bh_result, int create);
|
||||
|
|
|
|||
|
|
@ -25,7 +25,6 @@ typedef enum {
|
|||
i_link_saved_truncate_mask = 0x0020,
|
||||
i_has_xattr_dir = 0x0040,
|
||||
i_data_log = 0x0080,
|
||||
i_ever_mapped = 0x0100
|
||||
} reiserfs_inode_flags;
|
||||
|
||||
struct reiserfs_inode_info {
|
||||
|
|
@ -53,7 +52,8 @@ struct reiserfs_inode_info {
|
|||
** flushed */
|
||||
unsigned int i_trans_id;
|
||||
struct reiserfs_journal_list *i_jl;
|
||||
struct mutex i_mmap;
|
||||
atomic_t openers;
|
||||
struct mutex tailpack;
|
||||
#ifdef CONFIG_REISERFS_FS_XATTR
|
||||
struct rw_semaphore i_xattr_sem;
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
#define _LINUX_STATFS_H
|
||||
|
||||
#include <linux/types.h>
|
||||
|
||||
#include <asm/statfs.h>
|
||||
|
||||
struct kstatfs {
|
||||
|
|
@ -16,7 +15,29 @@ struct kstatfs {
|
|||
__kernel_fsid_t f_fsid;
|
||||
long f_namelen;
|
||||
long f_frsize;
|
||||
long f_spare[5];
|
||||
long f_flags;
|
||||
long f_spare[4];
|
||||
};
|
||||
|
||||
/*
|
||||
* Definitions for the flag in f_flag.
|
||||
*
|
||||
* Generally these flags are equivalent to the MS_ flags used in the mount
|
||||
* ABI. The exception is ST_VALID which has the same value as MS_REMOUNT
|
||||
* which doesn't make any sense for statfs.
|
||||
*/
|
||||
#define ST_RDONLY 0x0001 /* mount read-only */
|
||||
#define ST_NOSUID 0x0002 /* ignore suid and sgid bits */
|
||||
#define ST_NODEV 0x0004 /* disallow access to device special files */
|
||||
#define ST_NOEXEC 0x0008 /* disallow program execution */
|
||||
#define ST_SYNCHRONOUS 0x0010 /* writes are synced at once */
|
||||
#define ST_VALID 0x0020 /* f_flags support is implemented */
|
||||
#define ST_MANDLOCK 0x0040 /* allow mandatory locks on an FS */
|
||||
/* 0x0080 used for ST_WRITE in glibc */
|
||||
/* 0x0100 used for ST_APPEND in glibc */
|
||||
/* 0x0200 used for ST_IMMUTABLE in glibc */
|
||||
#define ST_NOATIME 0x0400 /* do not update access times */
|
||||
#define ST_NODIRATIME 0x0800 /* do not update directory access times */
|
||||
#define ST_RELATIME 0x1000 /* update atime relative to mtime/ctime */
|
||||
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue