diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-08-21 00:40:00 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-08-21 00:40:00 -0400 |
| commit | 646352319b6cd369750a706706810d87f6b6efa7 (patch) | |
| tree | e7830e1276cbad7d29bf9471def4b8940592c3b7 /fs/nfs/nfs3acl.c | |
| parent | d3485d37c0b3292aec0618b6663c57542df5da99 (diff) | |
| parent | f6fdd7d9c273bb2a20ab467cb57067494f932fa3 (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'fs/nfs/nfs3acl.c')
| -rw-r--r-- | fs/nfs/nfs3acl.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/nfs/nfs3acl.c b/fs/nfs/nfs3acl.c index 1b7a3ef2f813..6a5bbc0ae941 100644 --- a/fs/nfs/nfs3acl.c +++ b/fs/nfs/nfs3acl.c | |||
| @@ -308,7 +308,9 @@ static int nfs3_proc_setacls(struct inode *inode, struct posix_acl *acl, | |||
| 308 | nfs_begin_data_update(inode); | 308 | nfs_begin_data_update(inode); |
| 309 | status = rpc_call(server->client_acl, ACLPROC3_SETACL, | 309 | status = rpc_call(server->client_acl, ACLPROC3_SETACL, |
| 310 | &args, &fattr, 0); | 310 | &args, &fattr, 0); |
| 311 | NFS_FLAGS(inode) |= NFS_INO_INVALID_ACCESS; | 311 | spin_lock(&inode->i_lock); |
| 312 | NFS_I(inode)->cache_validity |= NFS_INO_INVALID_ACCESS; | ||
| 313 | spin_unlock(&inode->i_lock); | ||
| 312 | nfs_end_data_update(inode); | 314 | nfs_end_data_update(inode); |
| 313 | dprintk("NFS reply setacl: %d\n", status); | 315 | dprintk("NFS reply setacl: %d\n", status); |
| 314 | 316 | ||