Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa385729 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Al Viro
Browse files

fs: pass exact type of data dirties to ->dirty_inode 



Tell the filesystem if we just updated timestamp (I_DIRTY_SYNC) or
anything else, so that the filesystem can track internally if it
needs to push out a transaction for fdatasync or not.

This is just the prototype change with no user for it yet.  I plan
to push large XFS changes for the next merge window, and getting
this trivial infrastructure in this window would help a lot to avoid
tree interdependencies.

Also remove incorrect comments that ->dirty_inode can't block.  That
has been changed a long time ago, and many implementations rely on it.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent d6e9bd25

Documentation/filesystems/Locking

+2 −2
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ of the locking scheme for directory operations. 
prototypes:

	struct inode *(*alloc_inode)(struct super_block *sb);

	void (*destroy_inode)(struct inode *);

	void (*dirty_inode) (struct inode *);

	void (*dirty_inode) (struct inode *, int flags);

	int (*write_inode) (struct inode *, struct writeback_control *wbc);

	int (*drop_inode) (struct inode *);

	void (*evict_inode) (struct inode *);
@@ -126,7 +126,7 @@ locking rules: 
			s_umount

alloc_inode:

destroy_inode:

dirty_inode:				(must not sleep)

dirty_inode:

write_inode:

drop_inode:				!!!inode->i_lock!!!

evict_inode:

Documentation/filesystems/vfs.txt

+1 −1
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ struct super_operations { 
        struct inode *(*alloc_inode)(struct super_block *sb);

        void (*destroy_inode)(struct inode *);



        void (*dirty_inode) (struct inode *);

        void (*dirty_inode) (struct inode *, int flags);

        int (*write_inode) (struct inode *, int);

        void (*drop_inode) (struct inode *);

        void (*delete_inode) (struct inode *);

fs/btrfs/ctree.h

+1 −1
Original line number Diff line number Diff line
@@ -2522,7 +2522,7 @@ int btrfs_readpage(struct file *file, struct page *page); 
void btrfs_evict_inode(struct inode *inode);

void btrfs_put_inode(struct inode *inode);

int btrfs_write_inode(struct inode *inode, struct writeback_control *wbc);

void btrfs_dirty_inode(struct inode *inode);

void btrfs_dirty_inode(struct inode *inode, int flags);

struct inode *btrfs_alloc_inode(struct super_block *sb);

void btrfs_destroy_inode(struct inode *inode);

int btrfs_drop_inode(struct inode *inode);

fs/btrfs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -4396,7 +4396,7 @@ int btrfs_write_inode(struct inode *inode, struct writeback_control *wbc) 
 * FIXME, needs more benchmarking...there are no reasons other than performance

 * to keep or drop this code.

 */

void btrfs_dirty_inode(struct inode *inode)

void btrfs_dirty_inode(struct inode *inode, int flags)

{

	struct btrfs_root *root = BTRFS_I(inode)->root;

	struct btrfs_trans_handle *trans;

fs/ext3/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -3392,7 +3392,7 @@ int ext3_mark_inode_dirty(handle_t *handle, struct inode *inode) 
 * so would cause a commit on atime updates, which we don't bother doing.

 * We handle synchronous inodes at the highest possible level.

 */

void ext3_dirty_inode(struct inode *inode)

void ext3_dirty_inode(struct inode *inode, int flags)

{

	handle_t *current_handle = ext3_journal_current_handle();

	handle_t *handle;