diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-10-05 14:26:11 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-10-07 17:41:46 -0400 |
| commit | 2f28ea614ff497202d5a52af82da523ae4a20718 (patch) | |
| tree | 9793e6d84b4d33fbd552b377e0b4e12a21484794 /fs | |
| parent | 076f1fc94c44be2664172c63b4a2b51ae2d265ea (diff) | |
NFS: Fix up nfs_setattr_update_inode()
Ensure that it sets the inode metadata under the correct spinlock.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/nfs/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c index a2f54154d825..f3b8ed904df7 100644 --- a/fs/nfs/inode.c +++ b/fs/nfs/inode.c | |||
| @@ -453,6 +453,7 @@ out_big: | |||
| 453 | void nfs_setattr_update_inode(struct inode *inode, struct iattr *attr) | 453 | void nfs_setattr_update_inode(struct inode *inode, struct iattr *attr) |
| 454 | { | 454 | { |
| 455 | if ((attr->ia_valid & (ATTR_MODE|ATTR_UID|ATTR_GID)) != 0) { | 455 | if ((attr->ia_valid & (ATTR_MODE|ATTR_UID|ATTR_GID)) != 0) { |
| 456 | spin_lock(&inode->i_lock); | ||
| 456 | if ((attr->ia_valid & ATTR_MODE) != 0) { | 457 | if ((attr->ia_valid & ATTR_MODE) != 0) { |
| 457 | int mode = attr->ia_mode & S_IALLUGO; | 458 | int mode = attr->ia_mode & S_IALLUGO; |
| 458 | mode |= inode->i_mode & ~S_IALLUGO; | 459 | mode |= inode->i_mode & ~S_IALLUGO; |
| @@ -462,7 +463,6 @@ void nfs_setattr_update_inode(struct inode *inode, struct iattr *attr) | |||
| 462 | inode->i_uid = attr->ia_uid; | 463 | inode->i_uid = attr->ia_uid; |
| 463 | if ((attr->ia_valid & ATTR_GID) != 0) | 464 | if ((attr->ia_valid & ATTR_GID) != 0) |
| 464 | inode->i_gid = attr->ia_gid; | 465 | inode->i_gid = attr->ia_gid; |
| 465 | spin_lock(&inode->i_lock); | ||
| 466 | NFS_I(inode)->cache_validity |= NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL; | 466 | NFS_I(inode)->cache_validity |= NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL; |
| 467 | spin_unlock(&inode->i_lock); | 467 | spin_unlock(&inode->i_lock); |
| 468 | } | 468 | } |
