| Message ID | 1391448249-761-1-git-send-email-dsterba@suse.cz (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c index 730dce395858..f65355dfc882 100644 --- a/fs/btrfs/send.c +++ b/fs/btrfs/send.c @@ -1408,11 +1408,7 @@ static int gen_unique_name(struct send_ctx *sctx, while (1) { len = snprintf(tmp, sizeof(tmp), "o%llu-%llu-%llu", ino, gen, idx); - if (len >= sizeof(tmp)) { - /* should really not happen */ - ret = -EOVERFLOW; - goto out; - } + ASSERT(len < sizeof(tmp)); di = btrfs_lookup_dir_item(NULL, sctx->send_root, path, BTRFS_FIRST_FREE_OBJECTID,
The buffer passed to snprintf can hold the fully expanded format string, 64 = 3x largest ULL + 3x char + trailing null. I don't think that removing the check entirely is a good idea, hence the ASSERT. Signed-off-by: David Sterba <dsterba@suse.cz> --- fs/btrfs/send.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-)