diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-11-26 15:04:42 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-11-26 15:04:47 +0100 |
| commit | e4e91ac410356da3a518188f371e9d3b52ee38ee (patch) | |
| tree | e1b33743a08847030285d34bcb2eb8ba90f30a0c /fs/ceph/super.h | |
| parent | ea7872b9d6a81101f6ba0ec141544a62fea35876 (diff) | |
| parent | 3561d43fd289f590fdae672e5eb831b8d5cf0bf6 (diff) | |
Merge commit 'v2.6.37-rc3' into perf/core
Merge reason: Pick up latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'fs/ceph/super.h')
| -rw-r--r-- | fs/ceph/super.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/ceph/super.h b/fs/ceph/super.h index 1886294e12f..7f01728a465 100644 --- a/fs/ceph/super.h +++ b/fs/ceph/super.h @@ -293,9 +293,7 @@ struct ceph_inode_info { int i_rd_ref, i_rdcache_ref, i_wr_ref; int i_wrbuffer_ref, i_wrbuffer_ref_head; u32 i_shared_gen; /* increment each time we get FILE_SHARED */ - u32 i_rdcache_gen; /* we increment this each time we get - FILE_CACHE. If it's non-zero, we - _may_ have cached pages. */ + u32 i_rdcache_gen; /* incremented each time we get FILE_CACHE. */ u32 i_rdcache_revoking; /* RDCACHE gen to async invalidate, if any */ struct list_head i_unsafe_writes; /* uncommitted sync writes */ |