diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-31 02:24:34 +0100 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-31 02:24:34 +0100 |
commit | 95dbf5c4be080e94880ead13773d1a14eec8f4de (patch) | |
tree | 9113691b4b6c689989b4528ee0f3df3689c42066 /fs | |
parent | Merge branch 'upstream' (diff) | |
parent | Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/... (diff) | |
download | linux-95dbf5c4be080e94880ead13773d1a14eec8f4de.tar.xz linux-95dbf5c4be080e94880ead13773d1a14eec8f4de.zip |
Merge branch 'master'
Diffstat (limited to 'fs')
-rw-r--r-- | fs/nfs/inode.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c index f2781ca42761..fc0f12ba89cc 100644 --- a/fs/nfs/inode.c +++ b/fs/nfs/inode.c @@ -1274,14 +1274,12 @@ static int nfs_check_inode_attributes(struct inode *inode, struct nfs_fattr *fat } if ((fattr->valid & NFS_ATTR_FATTR) == 0) { - spin_unlock(&inode->i_lock); return 0; } /* Has the inode gone and changed behind our back? */ if (nfsi->fileid != fattr->fileid || (inode->i_mode & S_IFMT) != (fattr->mode & S_IFMT)) { - spin_unlock(&inode->i_lock); return -EIO; } |