diff --git a/[refs] b/[refs] index b5c698a41713..e25fe7b919ff 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 08db2a701bd63d0e36f06a29137bf016a907cf71 +refs/heads/master: d3f8cf489993658702b7e58ff37162246263de53 diff --git a/trunk/fs/nfs/inode.c b/trunk/fs/nfs/inode.c index f2781ca42761..fc0f12ba89cc 100644 --- a/trunk/fs/nfs/inode.c +++ b/trunk/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; }