diff options
author | 2013-08-15 11:11:45 -0700 | |
---|---|---|
committer | 2013-08-15 11:11:45 -0700 | |
commit | ee3e542fec6e69bc9fb668698889a37d93950ddf (patch) | |
tree | e74ee766a4764769ef1d3d45d266b4dea64101d3 /fs/xfs/xfs_icache.c | |
parent | ceph: Remove bogus check in invalidatepage (diff) | |
parent | Merge branch 'akpm' (patches from Andrew Morton) (diff) | |
download | linux-dev-ee3e542fec6e69bc9fb668698889a37d93950ddf.tar.xz linux-dev-ee3e542fec6e69bc9fb668698889a37d93950ddf.zip |
Merge remote-tracking branch 'linus/master' into testing
Diffstat (limited to 'fs/xfs/xfs_icache.c')
-rw-r--r-- | fs/xfs/xfs_icache.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/xfs/xfs_icache.c b/fs/xfs/xfs_icache.c index 96e344e3e927..3f90e1ceb8d6 100644 --- a/fs/xfs/xfs_icache.c +++ b/fs/xfs/xfs_icache.c @@ -335,7 +335,9 @@ xfs_iget_cache_miss( iflags = XFS_INEW; if (flags & XFS_IGET_DONTCACHE) iflags |= XFS_IDONTCACHE; - ip->i_udquot = ip->i_gdquot = NULL; + ip->i_udquot = NULL; + ip->i_gdquot = NULL; + ip->i_pdquot = NULL; xfs_iflags_set(ip, iflags); /* insert the new inode */ |