diff options
| author | Chris Mason <chris.mason@oracle.com> | 2011-05-22 13:07:01 +0200 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2011-05-22 13:07:01 +0200 |
| commit | dcc6d073225b6b732a52477c91bd4edc9b4d5502 (patch) | |
| tree | 71da6844bb03c940c87c01a2a1f8c2e11cf85238 /fs/btrfs/btrfs_inode.h | |
| parent | Merge branch 'ino-alloc' of git://repo.or.cz/linux-btrfs-devel into inode_num... (diff) | |
| parent | btrfs: implement delayed inode items operation (diff) | |
| download | linux-dcc6d073225b6b732a52477c91bd4edc9b4d5502.tar.xz linux-dcc6d073225b6b732a52477c91bd4edc9b4d5502.zip | |
Merge branch 'delayed_inode' into inode_numbers
Conflicts:
fs/btrfs/inode.c
fs/btrfs/ioctl.c
fs/btrfs/transaction.c
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/btrfs_inode.h')
| -rw-r--r-- | fs/btrfs/btrfs_inode.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/fs/btrfs/btrfs_inode.h b/fs/btrfs/btrfs_inode.h index 8842a4195f91..d0b0e43a6a8b 100644 --- a/fs/btrfs/btrfs_inode.h +++ b/fs/btrfs/btrfs_inode.h @@ -22,6 +22,7 @@ #include "extent_map.h" #include "extent_io.h" #include "ordered-data.h" +#include "delayed-inode.h" /* in memory btrfs inode */ struct btrfs_inode { @@ -158,9 +159,13 @@ struct btrfs_inode { */ unsigned force_compress:4; + struct btrfs_delayed_node *delayed_node; + struct inode vfs_inode; }; +extern unsigned char btrfs_filetype_table[]; + static inline struct btrfs_inode *BTRFS_I(struct inode *inode) { return container_of(inode, struct btrfs_inode, vfs_inode); |