diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-21 18:01:38 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-21 18:01:38 -0500 |
| commit | 8bd89ca22010847e85de37b77d9f19f16b1962ad (patch) | |
| tree | 0bcee2ae6a85443177a6d95ed960301e0f4c9d57 /fs/ceph/super.h | |
| parent | b08b69a110bd981909c248f89997dcdcdfd5a39c (diff) | |
| parent | 97d79b403ef03f729883246208ef5d8a2ebc4d68 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
ceph: keep reference to parent inode on ceph_dentry
ceph: queue cap_snaps once per realm
libceph: fix socket write error handling
libceph: fix socket read error handling
Diffstat (limited to 'fs/ceph/super.h')
| -rw-r--r-- | fs/ceph/super.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/ceph/super.h b/fs/ceph/super.h index 20b907d76ae2..88fcaa21b801 100644 --- a/fs/ceph/super.h +++ b/fs/ceph/super.h | |||
| @@ -207,6 +207,7 @@ struct ceph_dentry_info { | |||
| 207 | struct dentry *dentry; | 207 | struct dentry *dentry; |
| 208 | u64 time; | 208 | u64 time; |
| 209 | u64 offset; | 209 | u64 offset; |
| 210 | struct inode *parent_inode; | ||
| 210 | }; | 211 | }; |
| 211 | 212 | ||
| 212 | struct ceph_inode_xattrs_info { | 213 | struct ceph_inode_xattrs_info { |