From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.5 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 83FE3C4727F for ; Fri, 25 Sep 2020 06:24:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4E69E2311B for ; Fri, 25 Sep 2020 06:24:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727366AbgIYGX7 (ORCPT ); Fri, 25 Sep 2020 02:23:59 -0400 Received: from out30-43.freemail.mail.aliyun.com ([115.124.30.43]:43470 "EHLO out30-43.freemail.mail.aliyun.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727183AbgIYGXz (ORCPT ); Fri, 25 Sep 2020 02:23:55 -0400 X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R661e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=e01e04420;MF=alex.shi@linux.alibaba.com;NM=1;PH=DS;RN=5;SR=0;TI=SMTPD_---0UA0Ih0N_1601015032; Received: from IT-FVFX43SYHV2H.local(mailfrom:alex.shi@linux.alibaba.com fp:SMTPD_---0UA0Ih0N_1601015032) by smtp.aliyun-inc.com(127.0.0.1); Fri, 25 Sep 2020 14:23:52 +0800 Subject: Re: [PATCH V2] doc: zh_CN: add translatation for btrfs To: Wang Qing , Harry Wei , Jonathan Corbet , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org References: <1600928938-22829-1-git-send-email-wangqing@vivo.com> From: Alex Shi Message-ID: Date: Fri, 25 Sep 2020 14:21:37 +0800 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:68.0) Gecko/20100101 Thunderbird/68.7.0 MIME-Version: 1.0 In-Reply-To: <1600928938-22829-1-git-send-email-wangqing@vivo.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org I still can not apply your patch, is there sth wrong? Applying: doc: zh_CN: add translatation for btrfs error: dev/null: does not exist in index Patch failed at 0001 doc: zh_CN: add translatation for btrfs The copy of the patch that failed is found in: /root/linux-next/.git/rebase-apply/patch Also can not read your patch in git too. Thanks Alex 在 2020/9/24 下午2:28, Wang Qing 写道: > Translate Documentation/filesystems/btrfs.rst into Chinese. > > Signed-off-by: Wang Qing > --- > .../translations/zh_CN/filesystems/btrfs.rst | 37 ++++++++++++++++++++++ > 1 file changed, 37 insertions(+) > > diff --git a/Documentation/translations/zh_CN/filesystems/btrfs.rst b/Documentation/translations/zh_CN/filesystems/btrfs.rst > index 0000000..8b8cca2 > --- /dev/null > +++ b/Documentation/translations/zh_CN/filesystems/btrfs.rst > @@ -0,0 +1,37 @@ > +.. SPDX-License-Identifier: GPL-2.0 > + > +.. include:: ../disclaimer-zh_CN.rst > + > +:Original: :ref:`Documentation/filesystems/ext3.rst ` > + > +translated by 王擎 Wang Qing > + > +===== > +BTRFS > +===== > + > +Btrfs是一个写时复制更新的文件系统，它注重容错、修复和易于管理。 > +Btrfs由多家公司联合开发，并获得GPL许可，免费开放给所有人。 > + > +Btrfs的主要功能包括： > + > + *扩展大小的文件存储（文件最大支持2^64） > + *填充方式使小文件更节省空间 > + *索引目录的方式更节省空间 > + *动态的索引节点分配方式 > + *可写快照的特性 > + *支持子卷（独立的内部根文件系统） > + *对象级别的镜像克隆 > + *基于数据和元数据的校验和（支持多种算法） > + *支持压缩 > + *內建多种磁盘阵列算法，支持多种设备 > + *支持离线的文件系统检查 > + *高效的增量备份和文件系统镜像 > + *在线文件系统碎片整理 > + > +更多有关信息，请参阅Wiki > + > + https://btrfs.wiki.kernel.org > + > +维护信息包含管理任务、常见问题、用例、挂载选项、变更日志、 > +特性、手册、源码仓、联系人等。 >