diff options
| author | Wolfram Sang <w.sang@pengutronix.de> | 2012-10-08 12:46:32 +0200 |
|---|---|---|
| committer | Wolfram Sang <w.sang@pengutronix.de> | 2012-10-08 12:46:32 +0200 |
| commit | 102084d3d3969646cc89ea159e50898aeafc6649 (patch) | |
| tree | e92924469b3fab3ee6fa29e338e0a3a4cb167e82 /fs/nfs/inode.c | |
| parent | i2c: add Renesas R-Car I2C driver (diff) | |
| parent | Linux 3.6-rc7 (diff) | |
| download | linux-102084d3d3969646cc89ea159e50898aeafc6649.tar.xz linux-102084d3d3969646cc89ea159e50898aeafc6649.zip | |
Merge tag 'v3.6-rc7' into i2c-embedded/for-next
Linux 3.6-rc7
Needed to get updates from i2c-embedded/for-current into i2c-embedded/for-next
Diffstat (limited to 'fs/nfs/inode.c')
| -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 c6e895f0fbf3..9b47610338f5 100644 --- a/fs/nfs/inode.c +++ b/fs/nfs/inode.c @@ -154,7 +154,7 @@ static void nfs_zap_caches_locked(struct inode *inode) nfsi->attrtimeo = NFS_MINATTRTIMEO(inode); nfsi->attrtimeo_timestamp = jiffies; - memset(NFS_COOKIEVERF(inode), 0, sizeof(NFS_COOKIEVERF(inode))); + memset(NFS_I(inode)->cookieverf, 0, sizeof(NFS_I(inode)->cookieverf)); if (S_ISREG(mode) || S_ISDIR(mode) || S_ISLNK(mode)) nfsi->cache_validity |= NFS_INO_INVALID_ATTR|NFS_INO_INVALID_DATA|NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL|NFS_INO_REVAL_PAGECACHE; else |