From: Robert Yang <liezhi.yang@windriver.com>
To: <linux-ext4@vger.kernel.org>
Cc: <tytso@mit.edu>, <dvhart@linux.intel.com>
Subject: [RFC 08/10] misc/util.c: handle hardlinks
Date: Wed, 28 Aug 2013 13:25:58 +0800 [thread overview]
Message-ID: <1377667560-20089-9-git-send-email-liezhi.yang@windriver.com> (raw)
In-Reply-To: <1377667560-20089-1-git-send-email-liezhi.yang@windriver.com>
Create the file and save the source inode number when we meet the hard
link at the first time, use ext2fs_link() to link the name to the target
inode number when we meet the same source inode number again.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
misc/util.c | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 85 insertions(+)
diff --git a/misc/util.c b/misc/util.c
index 1a0a58c..11134db 100644
--- a/misc/util.c
+++ b/misc/util.c
@@ -314,6 +314,42 @@ void dump_mmp_msg(struct mmp_struct *mmp, const char *msg)
}
}
+/* Link an inode number to a directory */
+static errcode_t add_link(ext2_ino_t parent_ino, ext2_ino_t ino, const char *name)
+{
+ struct ext2_inode inode;
+ errcode_t retval;
+ char *func_name = "add_to_dir";
+
+ retval = ext2fs_read_inode(current_fs, ino, &inode);
+ if (retval) {
+ com_err(func_name, retval, "while reading inode %u", ino);
+ return retval;
+ }
+
+ retval = ext2fs_link(current_fs, parent_ino, name, ino, inode.i_flags);
+ if (retval == EXT2_ET_DIR_NO_SPACE) {
+ retval = ext2fs_expand_dir(current_fs, parent_ino);
+ if (retval) {
+ com_err(func_name, retval, "while expanding directory");
+ return retval;
+ }
+ retval = ext2fs_link(current_fs, parent_ino, name, ino, inode.i_flags);
+ }
+ if (retval) {
+ com_err(func_name, retval, "while linking %s", name);
+ return retval;
+ }
+
+ inode.i_links_count++;
+
+ retval = ext2fs_write_inode(current_fs, ino, &inode);
+ if (retval)
+ com_err(func_name, retval, "while writing inode %u", ino);
+
+ return retval;
+}
+
/* Fill the uid, gid, mode and time for the inode */
static void fill_inode(struct ext2_inode *inode, struct stat *st)
{
@@ -542,6 +578,17 @@ try_again:
}
}
+int is_hardlink(ext2_ino_t ino)
+{
+ int i;
+
+ for(i = 0; i < hdlinks.count; i++) {
+ if(hdlinks.hdl[i].src_ino == ino)
+ return i;
+ }
+ return -1;
+}
+
/* Copy the native file to the fs */
errcode_t do_write_internal(ext2_ino_t cwd, const char *src, const char *dest)
{
@@ -640,10 +687,12 @@ errcode_t populate_fs(ext2_ino_t parent_ino, const char *source_dir)
struct dirent *dent;
struct stat st;
char ln_target[PATH_MAX];
+ unsigned int save_inode = 0;
char *func_name = "populate_fs";
ext2_ino_t ino;
errcode_t retval;
int read_cnt;
+ int hdlink;
root = EXT2_ROOT_INO;
@@ -665,6 +714,21 @@ errcode_t populate_fs(ext2_ino_t parent_ino, const char *source_dir)
lstat(dent->d_name, &st);
name = dent->d_name;
+ /* Check for hardlinks */
+ if (!S_ISDIR(st.st_mode) && !S_ISLNK(st.st_mode) && st.st_nlink > 1) {
+ hdlink = is_hardlink(st.st_ino);
+ if (hdlink >= 0) {
+ retval = add_link(parent_ino,
+ hdlinks.hdl[hdlink].dst_ino, name);
+ if (retval) {
+ com_err(func_name, retval, "while linking %s", name);
+ return retval;
+ }
+ continue;
+ } else
+ save_inode = 1;
+ }
+
switch(st.st_mode & S_IFMT) {
case S_IFCHR:
case S_IFBLK:
@@ -733,6 +797,27 @@ errcode_t populate_fs(ext2_ino_t parent_ino, const char *source_dir)
_("while setting inode for \"%s\""), name);
return retval;
}
+
+ /* Save the hardlink ino */
+ if (save_inode) {
+ /*
+ * Check whether need more memory, and we don't need
+ * free() since the lifespan will be over after the fs
+ * populated.
+ */
+ if (hdlinks.count == hdlink_cnt) {
+ if ((hdlinks.hdl = realloc (hdlinks.hdl,
+ (hdlink_cnt + HDLINK_CNT) *
+ sizeof (struct hdlink_s))) == NULL) {
+ com_err(name, errno, "Not enough memory");
+ return errno;
+ }
+ hdlink_cnt += HDLINK_CNT;
+ }
+ hdlinks.hdl[hdlinks.count].src_ino = st.st_ino;
+ hdlinks.hdl[hdlinks.count].dst_ino = ino;
+ hdlinks.count++;
+ }
}
closedir(dh);
return retval;
--
1.8.1.2
next prev parent reply other threads:[~2013-08-28 5:30 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-28 5:25 [RFC 00/10] e2fsprogs/mke2fs: add an option: -d root-directory Robert Yang
2013-08-28 5:25 ` [RFC 01/10] mke2fs.c: " Robert Yang
2013-10-14 2:41 ` Theodore Ts'o
2013-10-14 12:22 ` [PATCH] mke2fs: fix up the commit "mke2fs.c: add an option: -d root-directory" Theodore Ts'o
2013-10-14 16:26 ` [RFC 01/10] mke2fs.c: add an option: -d root-directory Darren Hart
2013-10-15 1:38 ` Robert Yang
2013-08-28 5:25 ` [RFC 02/10] misc/util.c: implement populate_fs() Robert Yang
2013-08-28 5:25 ` [RFC 03/10] misc/util.c: create special file Robert Yang
2013-08-28 5:25 ` [RFC 04/10] misc/util.c: create symlink Robert Yang
2013-08-28 5:25 ` [RFC 05/10] misc/util.c: copy regular file Robert Yang
2013-08-28 5:25 ` [RFC 06/10] misc/util.c: create directory Robert Yang
2013-08-28 5:25 ` [RFC 07/10] misc/util.c: set more information for inode Robert Yang
2013-08-28 5:25 ` Robert Yang [this message]
2013-08-28 5:25 ` [RFC 09/10] mke2fs.8.in: update the manual for the -d option Robert Yang
2013-08-28 5:26 ` [RFC 10/10] debugfs: use the functions in misc/util.c Robert Yang
2013-10-14 14:40 ` Theodore Ts'o
2013-09-01 3:26 ` [RFC 00/10] e2fsprogs/mke2fs: add an option: -d root-directory Zheng Liu
2013-09-02 6:46 ` Robert Yang
2013-09-02 11:55 ` Zheng Liu
2013-09-02 12:20 ` Robert Yang
2013-09-02 12:27 ` Zheng Liu
2013-09-16 21:04 ` Darren Hart
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1377667560-20089-9-git-send-email-liezhi.yang@windriver.com \
--to=liezhi.yang@windriver.com \
--cc=dvhart@linux.intel.com \
--cc=linux-ext4@vger.kernel.org \
--cc=tytso@mit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).