diff options
| author | Chris Mason <chris.mason@oracle.com> | 2011-05-23 20:37:47 +0200 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2011-05-23 20:37:47 +0200 |
| commit | d6c0cb379c5198487e4ac124728cbb2346d63b1f (patch) | |
| tree | 167a97ac58c7a2fbf7c4e94b6abbfe1e03af014a /fs/btrfs/btrfs_inode.h | |
| parent | Btrfs: do not flush csum items of unchanged file data during treelog (diff) | |
| parent | Btrfs: using rcu lock in the reader side of devices list (diff) | |
| download | linux-d6c0cb379c5198487e4ac124728cbb2346d63b1f.tar.xz linux-d6c0cb379c5198487e4ac124728cbb2346d63b1f.zip | |
Merge branch 'cleanups_and_fixes' into inode_numbers
Conflicts:
fs/btrfs/tree-log.c
fs/btrfs/volumes.c
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/btrfs_inode.h')
0 files changed, 0 insertions, 0 deletions