OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

btrfs: send: clean up dead code 

Remove ifdefed code:

- tlv_put for 8, 16 and 32, add a generic tempalte if needed in future
- tlv_put_timespec - the btrfs_timespec fields are used
- fs_path_remove obsoleted long ago

Signed-off-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Josef Bacik <jbacik@fb.com>
Signed-off-by: Chris Mason <clm@fb.com>
This commit is contained in:
David Sterba 2013-12-16 17:34:10 +01:00 committed by Chris Mason
parent 3fe81ce206
commit 95bc79d50d
1 changed files with 8 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
fs/btrfs/send.c
View File

@ -344,16 +344,6 @@ out:
return ret;
}
#if 0
static void fs_path_remove(struct fs_path *p)
{
BUG_ON(p->reversed);
while (p->start != p->end && *p->end != '/')
p->end--;
*p->end = 0;
}
#endif
static int fs_path_copy(struct fs_path *p, struct fs_path *from)
{
int ret;
@ -444,30 +434,15 @@ static int tlv_put(struct send_ctx *sctx, u16 attr, const void *data, int len)
return 0;
}
#if 0
static int tlv_put_u8(struct send_ctx *sctx, u16 attr, u8 value)
{
return tlv_put(sctx, attr, &value, sizeof(value));
}
#define TLV_PUT_DEFINE_INT(bits) \
static int tlv_put_u##bits(struct send_ctx *sctx, \
u##bits attr, u##bits value) \
{ \
__le##bits __tmp = cpu_to_le##bits(value); \
return tlv_put(sctx, attr, &__tmp, sizeof(__tmp)); \
}
static int tlv_put_u16(struct send_ctx *sctx, u16 attr, u16 value)
{
__le16 tmp = cpu_to_le16(value);
return tlv_put(sctx, attr, &tmp, sizeof(tmp));
}
static int tlv_put_u32(struct send_ctx *sctx, u16 attr, u32 value)
{
__le32 tmp = cpu_to_le32(value);
return tlv_put(sctx, attr, &tmp, sizeof(tmp));
}
#endif
static int tlv_put_u64(struct send_ctx *sctx, u16 attr, u64 value)
{
__le64 tmp = cpu_to_le64(value);
return tlv_put(sctx, attr, &tmp, sizeof(tmp));
}
TLV_PUT_DEFINE_INT(64)
static int tlv_put_string(struct send_ctx *sctx, u16 attr,
const char *str, int len)
@ -483,17 +458,6 @@ static int tlv_put_uuid(struct send_ctx *sctx, u16 attr,
return tlv_put(sctx, attr, uuid, BTRFS_UUID_SIZE);
}
#if 0
static int tlv_put_timespec(struct send_ctx *sctx, u16 attr,
struct timespec *ts)
{
struct btrfs_timespec bts;
bts.sec = cpu_to_le64(ts->tv_sec);
bts.nsec = cpu_to_le32(ts->tv_nsec);
return tlv_put(sctx, attr, &bts, sizeof(bts));
}
#endif
static int tlv_put_btrfs_timespec(struct send_ctx *sctx, u16 attr,
struct extent_buffer *eb,
struct btrfs_timespec *ts)
@ -541,12 +505,6 @@ static int tlv_put_btrfs_timespec(struct send_ctx *sctx, u16 attr,
if (ret < 0) \
goto tlv_put_failure; \
} while (0)
#define TLV_PUT_TIMESPEC(sctx, attrtype, ts) \
do { \
ret = tlv_put_timespec(sctx, attrtype, ts); \
if (ret < 0) \
goto tlv_put_failure; \
} while (0)
#define TLV_PUT_BTRFS_TIMESPEC(sctx, attrtype, eb, ts) \
do { \
ret = tlv_put_btrfs_timespec(sctx, attrtype, eb, ts); \