From patchwork Fri Dec 6 09:57:57 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Liu X-Patchwork-Id: 297669 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id E44C82C00A0 for ; Fri, 6 Dec 2013 20:55:54 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757604Ab3LFJzw (ORCPT ); Fri, 6 Dec 2013 04:55:52 -0500 Received: from mail-pb0-f53.google.com ([209.85.160.53]:48998 "EHLO mail-pb0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757597Ab3LFJzr (ORCPT ); Fri, 6 Dec 2013 04:55:47 -0500 Received: by mail-pb0-f53.google.com with SMTP id ma3so778654pbc.26 for ; Fri, 06 Dec 2013 01:55:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=2GkniSOgJ+JZhvbNpPtVLQ7C576sUPBz+qmyIbUHJFk=; b=jS94ekBtoAJhWckWDDXqOZYoU/CiHaQwe3aus4uFR88Yeuur7CZ9GKcN3plqEsZCap QNn/pJJH4NaSvvZv94AqcAy5XDh+BuBx88YYXrbWK2NIv7i1kSlhbliv/4UZT/z0Zlk6 JQD9z23pagKiSwoy9iua+ZRkVJCaJko731jcD6/SKMT3Iiil3JIeh+UqpJb4eo34twfr PZc6mH6zY2EEQ+NB3Z6sI6cs/09nB1s9Fc9BhnR45XExGAt1mEpqKnGwBpkpO7BnMs7o 4rouy/0MVq4dEIQhmNnGh3J7JlbLXuMs98iUQMAQWjutIbA4MTjGiVhBSJCDWB6cONSW jGew== X-Received: by 10.68.228.138 with SMTP id si10mr3170231pbc.13.1386323746674; Fri, 06 Dec 2013 01:55:46 -0800 (PST) Received: from alpha.taobao.ali.com ([182.92.247.2]) by mx.google.com with ESMTPSA id m2sm56582620pbn.19.2013.12.06.01.55.44 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 06 Dec 2013 01:55:46 -0800 (PST) From: Zheng Liu To: linux-ext4@vger.kernel.org Cc: Theodore Ts'o , "Darrick J. Wong" , Zheng Liu Subject: [PATCH v3 10/30] libext2fs: define new dirent_swab interfaces for inline data Date: Fri, 6 Dec 2013 17:57:57 +0800 Message-Id: <1386323897-2354-11-git-send-email-wenqing.lz@taobao.com> X-Mailer: git-send-email 1.7.9.7 In-Reply-To: <1386323897-2354-1-git-send-email-wenqing.lz@taobao.com> References: <1386323897-2354-1-git-send-email-wenqing.lz@taobao.com> Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org From: Zheng Liu Later we will use ext2fs_dirent_swab_in/out to handle big-endian problem for inline data. Now interfaces assume that it handles a block, but it is not true after adding inline data. So this commit defines a new interface for inline data. Signed-off-by: Zheng Liu --- lib/ext2fs/ext2fs.h | 4 ++++ lib/ext2fs/swapfs.c | 16 ++++++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/lib/ext2fs/ext2fs.h b/lib/ext2fs/ext2fs.h index e251435..1d5b80c 100644 --- a/lib/ext2fs/ext2fs.h +++ b/lib/ext2fs/ext2fs.h @@ -1524,7 +1524,11 @@ extern errcode_t ext2fs_read_bb_FILE(ext2_filsys fs, FILE *f, extern errcode_t ext2fs_create_resize_inode(ext2_filsys fs); /* swapfs.c */ +extern errcode_t ext2fs_dirent_swab_in2(ext2_filsys fs, char *buf, size_t size, + int flags); extern errcode_t ext2fs_dirent_swab_in(ext2_filsys fs, char *buf, int flags); +extern errcode_t ext2fs_dirent_swab_out2(ext2_filsys fs, char *buf, size_t size, + int flags); extern errcode_t ext2fs_dirent_swab_out(ext2_filsys fs, char *buf, int flags); extern void ext2fs_swap_ext_attr(char *to, char *from, int bufsize, int has_header); diff --git a/lib/ext2fs/swapfs.c b/lib/ext2fs/swapfs.c index 1295e81..8dfdcc9 100644 --- a/lib/ext2fs/swapfs.c +++ b/lib/ext2fs/swapfs.c @@ -354,13 +354,19 @@ void ext2fs_swap_mmp(struct mmp_struct *mmp) errcode_t ext2fs_dirent_swab_in(ext2_filsys fs, char *buf, int flags) { + return ext2fs_dirent_swab_in(fs, buf, fs->blocksize, flags); +} + +errcode_t ext2fs_dirent_swab_in2(ext2_filsys fs, char *buf, + size_t size, int flags) +{ errcode_t retval; char *p, *end; struct ext2_dir_entry *dirent; unsigned int name_len, rec_len; p = (char *) buf; - end = (char *) buf + fs->blocksize; + end = (char *) buf + size; while (p < end-8) { dirent = (struct ext2_dir_entry *) p; dirent->inode = ext2fs_swab32(dirent->inode); @@ -385,13 +391,19 @@ errcode_t ext2fs_dirent_swab_in(ext2_filsys fs, char *buf, int flags) errcode_t ext2fs_dirent_swab_out(ext2_filsys fs, char *buf, int flags) { + return ext2fs_dirent_swab_out2(fs, buf, fs->blocksize, flags); +} + +errcode_t ext2fs_dirent_swab_out2(ext2_filsys fs, char *buf, + size_t size, int flags) +{ errcode_t retval; char *p, *end; unsigned int rec_len; struct ext2_dir_entry *dirent; p = buf; - end = buf + fs->blocksize; + end = buf + size; while (p < end) { dirent = (struct ext2_dir_entry *) p; retval = ext2fs_get_rec_len(fs, dirent, &rec_len);