diff options
author | David Sterba <dsterba@suse.com> | 2017-05-17 17:41:15 +0200 |
---|---|---|
committer | David Sterba <dsterba@suse.com> | 2017-05-17 17:41:15 +0200 |
commit | 8832082e4fb1c33f882e8bb0196e813c977604d9 (patch) | |
tree | 9df0d4d1ff3b4127ef2cad8c8ca3864620984c07 /fs | |
parent | 8818c1f0a5d4e3f7b95701a7e720d997234f4824 (diff) | |
parent | 981cb54dde2cdef8ab649c50ebb5c577d268080c (diff) |
Merge branch 'dev/clean-structs' into for-next-next-v4.13-20170517
Diffstat (limited to 'fs')
-rw-r--r-- | fs/btrfs/disk-io.c | 2 | ||||
-rw-r--r-- | fs/btrfs/reada.c | 1 | ||||
-rw-r--r-- | fs/btrfs/send.c | 8 |
3 files changed, 0 insertions, 11 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index b08d8685ab31..f52e98210590 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -89,7 +89,6 @@ struct btrfs_end_io_wq { struct btrfs_fs_info *info; int error; enum btrfs_wq_endio_type metadata; - struct list_head list; struct btrfs_work work; }; @@ -120,7 +119,6 @@ void btrfs_end_io_wq_exit(void) struct async_submit_bio { struct inode *inode; struct bio *bio; - struct list_head list; extent_submit_bio_hook_t *submit_bio_start; extent_submit_bio_hook_t *submit_bio_done; int mirror_num; diff --git a/fs/btrfs/reada.c b/fs/btrfs/reada.c index a17e775a4a89..ab852b8e3e37 100644 --- a/fs/btrfs/reada.c +++ b/fs/btrfs/reada.c @@ -66,7 +66,6 @@ struct reada_extctl { struct reada_extent { u64 logical; struct btrfs_key top; - int err; struct list_head extctl; int refcnt; spinlock_t lock; diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c index fc496a6f842a..e8185c83f667 100644 --- a/fs/btrfs/send.c +++ b/fs/btrfs/send.c @@ -2769,12 +2769,10 @@ out: struct recorded_ref { struct list_head list; - char *dir_path; char *name; struct fs_path *full_path; u64 dir; u64 dir_gen; - int dir_path_len; int name_len; }; @@ -2798,12 +2796,6 @@ static int __record_ref(struct list_head *head, u64 dir, ref->name = (char *)kbasename(ref->full_path->start); ref->name_len = ref->full_path->end - ref->name; - ref->dir_path = ref->full_path->start; - if (ref->name == ref->full_path->start) - ref->dir_path_len = 0; - else - ref->dir_path_len = ref->full_path->end - - ref->full_path->start - 1 - ref->name_len; list_add_tail(&ref->list, head); return 0; |