From 6fb2b54bbcf62f3d55071fcbac46a45910be7ef3 Mon Sep 17 00:00:00 2001 From: Erez Zadok Date: Fri, 10 Feb 2012 15:36:33 -0500 Subject: [PATCH] Unionfs: use set_nlinks Signed-off-by: Erez Zadok --- fs/unionfs/inode.c | 13 +++++++------ fs/unionfs/rename.c | 4 ++-- fs/unionfs/subr.c | 2 +- fs/unionfs/unlink.c | 2 +- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/fs/unionfs/inode.c b/fs/unionfs/inode.c index 83cb681d74f..afc9a2dc103 100644 --- a/fs/unionfs/inode.c +++ b/fs/unionfs/inode.c @@ -142,7 +142,7 @@ static int unionfs_create(struct inode *dir, struct dentry *dentry, fsstack_copy_inode_size(dir, lower_parent_dentry->d_inode); /* update no. of links on parent directory */ - dir->i_nlink = unionfs_get_nlinks(dir); + set_nlink(dir, unionfs_get_nlinks(dir)); } } @@ -253,7 +253,7 @@ static int unionfs_link(struct dentry *old_dentry, struct inode *dir, lower_dir_dentry = dget_parent(lower_new_dentry); fsstack_copy_attr_times(dir, lower_dir_dentry->d_inode); dput(lower_dir_dentry); - dir->i_nlink = unionfs_get_nlinks(dir); + set_nlink(dir, unionfs_get_nlinks(dir)); err = 0; } if (err) @@ -328,7 +328,8 @@ check_link: fsstack_copy_inode_size(dir, lower_new_dentry->d_parent->d_inode); /* propagate number of hard-links */ - old_dentry->d_inode->i_nlink = unionfs_get_nlinks(old_dentry->d_inode); + set_nlink(old_dentry->d_inode, + unionfs_get_nlinks(old_dentry->d_inode)); /* new dentry's ctime may have changed due to hard-link counts */ unionfs_copy_attr_times(new_dentry->d_inode); @@ -402,7 +403,7 @@ static int unionfs_symlink(struct inode *dir, struct dentry *dentry, fsstack_copy_inode_size(dir, lower_parent_dentry->d_inode); /* update no. of links on parent directory */ - dir->i_nlink = unionfs_get_nlinks(dir); + set_nlink(dir, unionfs_get_nlinks(dir)); } } @@ -514,7 +515,7 @@ static int unionfs_mkdir(struct inode *dir, struct dentry *dentry, int mode) lower_parent_dentry->d_inode); /* update number of links on parent directory */ - dir->i_nlink = unionfs_get_nlinks(dir); + set_nlink(dir, unionfs_get_nlinks(dir)); } err = make_dir_opaque(dentry, dbstart(dentry)); @@ -594,7 +595,7 @@ static int unionfs_mknod(struct inode *dir, struct dentry *dentry, int mode, fsstack_copy_inode_size(dir, lower_parent_dentry->d_inode); /* update no. of links on parent directory */ - dir->i_nlink = unionfs_get_nlinks(dir); + set_nlink(dir, unionfs_get_nlinks(dir)); } } diff --git a/fs/unionfs/rename.c b/fs/unionfs/rename.c index c8ab910d98d..ce85b842117 100644 --- a/fs/unionfs/rename.c +++ b/fs/unionfs/rename.c @@ -212,8 +212,8 @@ static int do_unionfs_rename(struct inode *old_dir, fsstack_copy_attr_times(new_parent->d_inode, unlink_dir_dentry->d_inode); /* propagate number of hard-links */ - new_parent->d_inode->i_nlink = - unionfs_get_nlinks(new_parent->d_inode); + set_nlink(new_parent->d_inode, + unionfs_get_nlinks(new_parent->d_inode)); unlock_dir(unlink_dir_dentry); if (!err) { diff --git a/fs/unionfs/subr.c b/fs/unionfs/subr.c index bdca2f73d62..e7fc5a5f528 100644 --- a/fs/unionfs/subr.c +++ b/fs/unionfs/subr.c @@ -91,5 +91,5 @@ void unionfs_copy_attr_all(struct inode *dest, * Update the nlinks AFTER updating the above fields, because the * get_links callback may depend on them. */ - dest->i_nlink = unionfs_get_nlinks(dest); + set_nlink(dest, unionfs_get_nlinks(dest)); } diff --git a/fs/unionfs/unlink.c b/fs/unionfs/unlink.c index bf447bbac22..25943a5643f 100644 --- a/fs/unionfs/unlink.c +++ b/fs/unionfs/unlink.c @@ -190,7 +190,7 @@ static int unionfs_rmdir_first(struct inode *dir, struct dentry *dentry, fsstack_copy_attr_times(dir, lower_dir_dentry->d_inode); /* propagate number of hard-links */ - dentry->d_inode->i_nlink = unionfs_get_nlinks(dentry->d_inode); + set_nlink(dentry->d_inode, unionfs_get_nlinks(dentry->d_inode)); out: if (lower_dir_dentry) -- 2.34.1