From 5d5b3e6b2e58b0443783876bbeaf8ab62d831fc8 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Sun, 30 Oct 2005 14:47:58 -0800 Subject: [PATCH] --- yaml --- r: 11415 b: refs/heads/master c: 6e9d6b8ee4e0c37d3952256e6472c57490d6780d h: refs/heads/master i: 11413: 904fa09bd7e21f09e1db56bed859168b275925e3 11411: ef4232aefadb9c5521203e68bde7cc5335796e32 11407: 17c36fde6bf90421b267fc2243b3727201c911d8 v: v3 --- [refs] | 2 +- trunk/drivers/pci/quirks.c | 4 ++-- trunk/fs/nfs/inode.c | 2 -- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 2c196c2e6e03..979b9000519e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a9524a76f70f3343e4be27f95a7e92a8ba5f9009 +refs/heads/master: 6e9d6b8ee4e0c37d3952256e6472c57490d6780d diff --git a/trunk/drivers/pci/quirks.c b/trunk/drivers/pci/quirks.c index bbd9c2323d8c..5627ce1d2b32 100644 --- a/trunk/drivers/pci/quirks.c +++ b/trunk/drivers/pci/quirks.c @@ -356,7 +356,7 @@ static void piix4_mem_quirk(struct pci_dev *dev, const char *name, unsigned int /* * PIIX4 ACPI: Two IO regions pointed to by longwords at * 0x40 (64 bytes of ACPI registers) - * 0x90 (32 bytes of SMB registers) + * 0x90 (16 bytes of SMB registers) * and a few strange programmable PIIX4 device resources. */ static void __devinit quirk_piix4_acpi(struct pci_dev *dev) @@ -366,7 +366,7 @@ static void __devinit quirk_piix4_acpi(struct pci_dev *dev) pci_read_config_dword(dev, 0x40, ®ion); quirk_io_region(dev, region, 64, PCI_BRIDGE_RESOURCES, "PIIX4 ACPI"); pci_read_config_dword(dev, 0x90, ®ion); - quirk_io_region(dev, region, 32, PCI_BRIDGE_RESOURCES+1, "PIIX4 SMB"); + quirk_io_region(dev, region, 16, PCI_BRIDGE_RESOURCES+1, "PIIX4 SMB"); /* Device resource A has enables for some of the other ones */ pci_read_config_dword(dev, 0x5c, &res_a); 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; }