Skip to content

Commit a525890

Browse files
torvaldstorvalds
committed
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
* git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable: (23 commits) Btrfs: fix extent_buffer leak during tree log replay Btrfs: fix oops when btrfs_inherit_iflags called with a NULL dir Btrfs: fix -o nodatasum printk spelling Btrfs: check duplicate backrefs for both data and metadata Btrfs: init worker struct fields before kthread-run Btrfs: pin buffers during write_dev_supers Btrfs: avoid races between super writeout and device list updates Fix btrfs when ACLs are configured out Btrfs: fdatasync should skip metadata writeout Btrfs: remove crc32c.h and use libcrc32c directly. Btrfs: implement FS_IOC_GETFLAGS/SETFLAGS/GETVERSION Btrfs: autodetect SSD devices Btrfs: add mount -o ssd_spread to spread allocations out Btrfs: avoid allocation clusters that are too spread out Btrfs: Add mount -o nossd Btrfs: avoid IO stalls behind congested devices in a multi-device FS Btrfs: don't allow WRITE_SYNC bios to starve out regular writes Btrfs: fix metadata dirty throttling limits Btrfs: reduce mount -o ssd CPU usage Btrfs: balance btree more often ...
2 parents 3bb66d7 + b263c2c commit a525890

29 files changed

+7336
-2183
lines changed

‎fs/btrfs/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ btrfs-y += super.o ctree.o extent-tree.o print-tree.o root-tree.o dir-item.o \
66
transaction.o inode.o file.o tree-defrag.o \
77
extent_map.o sysfs.o struct-funcs.o xattr.o ordered-data.o \
88
extent_io.o volumes.o async-thread.o ioctl.o locking.o orphan.o \
9-
ref-cache.o export.o tree-log.o acl.o free-space-cache.o zlib.o \
10-
compression.o delayed-ref.o
9+
export.o tree-log.o acl.o free-space-cache.o zlib.o \
10+
compression.o delayed-ref.o relocation.o

‎fs/btrfs/acl.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -351,9 +351,4 @@ int btrfs_init_acl(struct inode *inode, struct inode *dir)
351351
return 0;
352352
}
353353

354-
int btrfs_check_acl(struct inode *inode, int mask)
355-
{
356-
return 0;
357-
}
358-
359354
#endif /* CONFIG_FS_POSIX_ACL */

‎fs/btrfs/async-thread.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,10 +294,10 @@ int btrfs_start_workers(struct btrfs_workers *workers, int num_workers)
294294
INIT_LIST_HEAD(&worker->worker_list);
295295
spin_lock_init(&worker->lock);
296296
atomic_set(&worker->num_pending, 0);
297+
worker->workers = workers;
297298
worker->task = kthread_run(worker_loop, worker,
298299
"btrfs-%s-%d", workers->name,
299300
workers->num_workers + i);
300-
worker->workers = workers;
301301
if (IS_ERR(worker->task)) {
302302
kfree(worker);
303303
ret = PTR_ERR(worker->task);

‎fs/btrfs/btrfs_inode.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,9 @@ struct btrfs_inode {
7272
*/
7373
struct list_head ordered_operations;
7474

75+
/* node for the red-black tree that links inodes in subvolume root */
76+
struct rb_node rb_node;
77+
7578
/* the space_info for where this inode's data allocations are done */
7679
struct btrfs_space_info *space_info;
7780

@@ -154,5 +157,4 @@ static inline void btrfs_i_size_write(struct inode *inode, u64 size)
154157
BTRFS_I(inode)->disk_i_size = size;
155158
}
156159

157-
158160
#endif

‎fs/btrfs/compression.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ static int check_compressed_csum(struct inode *inode,
123123
u32 csum;
124124
u32 *cb_sum = &cb->sums;
125125

126-
if (btrfs_test_flag(inode, NODATASUM))
126+
if (BTRFS_I(inode)->flags & BTRFS_INODE_NODATASUM)
127127
return 0;
128128

129129
for (i = 0; i < cb->nr_pages; i++) {
@@ -670,7 +670,7 @@ int btrfs_submit_compressed_read(struct inode *inode, struct bio *bio,
670670
*/
671671
atomic_inc(&cb->pending_bios);
672672

673-
if (!btrfs_test_flag(inode, NODATASUM)) {
673+
if (!(BTRFS_I(inode)->flags & BTRFS_INODE_NODATASUM)) {
674674
btrfs_lookup_bio_sums(root, inode, comp_bio,
675675
sums);
676676
}
@@ -697,7 +697,7 @@ int btrfs_submit_compressed_read(struct inode *inode, struct bio *bio,
697697
ret = btrfs_bio_wq_end_io(root->fs_info, comp_bio, 0);
698698
BUG_ON(ret);
699699

700-
if (!btrfs_test_flag(inode, NODATASUM))
700+
if (!(BTRFS_I(inode)->flags & BTRFS_INODE_NODATASUM))
701701
btrfs_lookup_bio_sums(root, inode, comp_bio, sums);
702702

703703
ret = btrfs_map_bio(root, READ, comp_bio, mirror_num, 0);

‎fs/btrfs/crc32c.h

Lines changed: 0 additions & 29 deletions
This file was deleted.

0 commit comments

Comments
 (0)