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

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

pass writeback_control to ->write_inode 



This gives the filesystem more information about the writeback that
is happening.  Trond requested this for the NFS unstable write handling,
and other filesystems might benefit from this too by beeing able to
distinguish between the different callers in more detail.

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

fs/adfs/adfs.h

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ struct adfs_discmap { 


/* Inode stuff */

struct inode *adfs_iget(struct super_block *sb, struct object_info *obj);

int adfs_write_inode(struct inode *inode,int unused);

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

int adfs_notify_change(struct dentry *dentry, struct iattr *attr);



/* map.c */

fs/adfs/inode.c

+3 −2
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
 */

#include <linux/smp_lock.h>

#include <linux/buffer_head.h>

#include <linux/writeback.h>

#include "adfs.h"



/*
@@ -360,7 +361,7 @@ out: 
 * The adfs-specific inode data has already been updated by

 * adfs_notify_change()

 */

int adfs_write_inode(struct inode *inode, int wait)

int adfs_write_inode(struct inode *inode, struct writeback_control *wbc)

{

	struct super_block *sb = inode->i_sb;

	struct object_info obj;
@@ -375,7 +376,7 @@ int adfs_write_inode(struct inode *inode, int wait) 
	obj.attr	= ADFS_I(inode)->attr;

	obj.size	= inode->i_size;



	ret = adfs_dir_update(sb, &obj, wait);

	ret = adfs_dir_update(sb, &obj, wbc->sync_mode == WB_SYNC_ALL);

	unlock_kernel();

	return ret;

}

fs/affs/affs.h

+2 −1
Original line number Diff line number Diff line
@@ -175,7 +175,8 @@ extern void affs_delete_inode(struct inode *inode); 
extern void			 affs_clear_inode(struct inode *inode);

extern struct inode		*affs_iget(struct super_block *sb,

					unsigned long ino);

extern int			 affs_write_inode(struct inode *inode, int);

extern int			 affs_write_inode(struct inode *inode,

					struct writeback_control *wbc);

extern int			 affs_add_entry(struct inode *dir, struct inode *inode, struct dentry *dentry, s32 type);



/* file.c */

fs/affs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ bad_inode: 
}



int

affs_write_inode(struct inode *inode, int unused)

affs_write_inode(struct inode *inode, struct writeback_control *wbc)

{

	struct super_block	*sb = inode->i_sb;

	struct buffer_head	*bh;

fs/bfs/inode.c

+3 −2
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/smp_lock.h>

#include <linux/buffer_head.h>

#include <linux/vfs.h>

#include <linux/writeback.h>

#include <asm/uaccess.h>

#include "bfs.h"
@@ -98,7 +99,7 @@ error: 
	return ERR_PTR(-EIO);

}



static int bfs_write_inode(struct inode *inode, int wait)

static int bfs_write_inode(struct inode *inode, struct writeback_control *wbc)

{

	struct bfs_sb_info *info = BFS_SB(inode->i_sb);

	unsigned int ino = (u16)inode->i_ino;
@@ -147,7 +148,7 @@ static int bfs_write_inode(struct inode *inode, int wait) 
	di->i_eoffset = cpu_to_le32(i_sblock * BFS_BSIZE + inode->i_size - 1);



	mark_buffer_dirty(bh);

	if (wait) {

	if (wbc->sync_mode == WB_SYNC_ALL) {

		sync_dirty_buffer(bh);

		if (buffer_req(bh) && !buffer_uptodate(bh))

			err = -EIO;