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

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

remove inode_setattr 



Replace inode_setattr with opencoded variants of it in all callers.  This
moves the remaining call to vmtruncate into the filesystem methods where it
can be replaced with the proper truncate sequence.

In a few cases it was obvious that we would never end up calling vmtruncate
so it was left out in the opencoded variant:

 spufs: explicitly checks for ATTR_SIZE earlier
 btrfs,hugetlbfs,logfs,dlmfs: explicitly clears ATTR_SIZE earlier
 ufs: contains an opencoded simple_seattr + truncate that sets the filesize just above

In addition to that ncpfs called inode_setattr with handcrafted iattrs,
which allowed to trim down the opencoded variant.

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

arch/powerpc/platforms/cell/spufs/inode.c

+3 −1
Original line number Diff line number Diff line
@@ -110,7 +110,9 @@ spufs_setattr(struct dentry *dentry, struct iattr *attr) 
	if ((attr->ia_valid & ATTR_SIZE) &&

	    (attr->ia_size != inode->i_size))

		return -EINVAL;

	return inode_setattr(inode, attr);

	setattr_copy(inode, attr);

	mark_inode_dirty(inode);

	return 0;

}

drivers/staging/pohmelfs/inode.c

+10 −4
Original line number Diff line number Diff line
@@ -968,11 +968,17 @@ int pohmelfs_setattr_raw(struct inode *inode, struct iattr *attr) 
		goto err_out_exit;

	}



	err = inode_setattr(inode, attr);

	if ((attr->ia_valid & ATTR_SIZE) &&

	    attr->ia_size != i_size_read(inode)) {

		err = vmtruncate(inode, attr->ia_size);

		if (err) {

			dprintk("%s: ino: %llu, failed to set the attributes.\n", __func__, POHMELFS_I(inode)->ino);

			goto err_out_exit;

		}

	}



	setattr_copy(inode, attr);

	mark_inode_dirty(inode);



	dprintk("%s: ino: %llu, mode: %o -> %o, uid: %u -> %u, gid: %u -> %u, size: %llu -> %llu.\n",

			__func__, POHMELFS_I(inode)->ino, inode->i_mode, attr->ia_mode,

fs/9p/vfs_inode.c

+12 −3
Original line number Diff line number Diff line
@@ -896,12 +896,21 @@ static int v9fs_vfs_setattr(struct dentry *dentry, struct iattr *iattr) 
	}



	retval = p9_client_wstat(fid, &wstat);

	if (retval >= 0)

		retval = inode_setattr(dentry->d_inode, iattr);

	if (retval < 0)

		return retval;



	if ((iattr->ia_valid & ATTR_SIZE) &&

	    iattr->ia_size != i_size_read(dentry->d_inode)) {

		retval = vmtruncate(dentry->d_inode, iattr->ia_size);

		if (retval)

			return retval;

	}



	setattr_copy(dentry->d_inode, iattr);

	mark_inode_dirty(dentry->d_inode);

	return 0;

}



/**

 * v9fs_stat2inode - populate an inode structure with mistat info

 * @stat: Plan 9 metadata (mistat) structure

fs/affs/inode.c

+11 −2
Original line number Diff line number Diff line
@@ -235,8 +235,17 @@ affs_notify_change(struct dentry *dentry, struct iattr *attr) 
		goto out;

	}



	error = inode_setattr(inode, attr);

	if (!error && (attr->ia_valid & ATTR_MODE))

	if ((attr->ia_valid & ATTR_SIZE) &&

	    attr->ia_size != i_size_read(inode)) {

		error = vmtruncate(inode, attr->ia_size);

		if (error)

			return error;

	}



	setattr_copy(inode, attr);

	mark_inode_dirty(inode);



	if (attr->ia_valid & ATTR_MODE)

		mode_to_prot(inode);

out:

	return error;

fs/attr.c

+0 −25
Original line number Diff line number Diff line
@@ -146,31 +146,6 @@ void setattr_copy(struct inode *inode, const struct iattr *attr) 
}

EXPORT_SYMBOL(setattr_copy);



/*

 * note this function is deprecated, the new truncate sequence should be

 * used instead -- see eg. simple_setsize, setattr_copy.

 */

int inode_setattr(struct inode *inode, const struct iattr *attr)

{

	unsigned int ia_valid = attr->ia_valid;



	if (ia_valid & ATTR_SIZE &&

	    attr->ia_size != i_size_read(inode)) {

		int error;



		error = vmtruncate(inode, attr->ia_size);

		if (error)

			return error;

	}



	setattr_copy(inode, attr);



	mark_inode_dirty(inode);



	return 0;

}

EXPORT_SYMBOL(inode_setattr);



int notify_change(struct dentry * dentry, struct iattr * attr)

{

	struct inode *inode = dentry->d_inode;