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

Commit 2f28ea61 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFS: Fix up nfs_setattr_update_inode() 



Ensure that it sets the inode metadata under the correct spinlock.

Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 076f1fc9

fs/nfs/inode.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -453,6 +453,7 @@ static int nfs_vmtruncate(struct inode * inode, loff_t offset) 
void nfs_setattr_update_inode(struct inode *inode, struct iattr *attr)

void nfs_setattr_update_inode(struct inode *inode, struct iattr *attr)

{

{

	if ((attr->ia_valid & (ATTR_MODE|ATTR_UID|ATTR_GID)) != 0) {

	if ((attr->ia_valid & (ATTR_MODE|ATTR_UID|ATTR_GID)) != 0) {

		spin_lock(&inode->i_lock);

		if ((attr->ia_valid & ATTR_MODE) != 0) {

		if ((attr->ia_valid & ATTR_MODE) != 0) {

			int mode = attr->ia_mode & S_IALLUGO;

			int mode = attr->ia_mode & S_IALLUGO;

			mode |= inode->i_mode & ~S_IALLUGO;

			mode |= inode->i_mode & ~S_IALLUGO;
@@ -462,7 +463,6 @@ void nfs_setattr_update_inode(struct inode *inode, struct iattr *attr) 
			inode->i_uid = attr->ia_uid;

			inode->i_uid = attr->ia_uid;

		if ((attr->ia_valid & ATTR_GID) != 0)

		if ((attr->ia_valid & ATTR_GID) != 0)

			inode->i_gid = attr->ia_gid;

			inode->i_gid = attr->ia_gid;

		spin_lock(&inode->i_lock);

		NFS_I(inode)->cache_validity |= NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL;

		NFS_I(inode)->cache_validity |= NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL;

		spin_unlock(&inode->i_lock);

		spin_unlock(&inode->i_lock);

	}

	}