Unionfs: use VFS helpers to manipulate i_nlink

Signed-off-by: Erez Zadok <ezk@cs.sunysb.edu>

diff --git a/fs/unionfs/compat.h b/fs/unionfs/compat.h
index 71ebb816a0faead4425d27fbfbcee8b04f194904..3d93798f39bee9be7dd761d804fce078d8515d54 100644 (file)
--- a/fs/unionfs/compat.h
+++ b/fs/unionfs/compat.h
@@ -94,4 +94,14 @@ static inline loff_t page_offset(struct page *page)
        return ((loff_t)page->index) << PAGE_CACHE_SHIFT;
 }
 
+/* from include/linux/fs.h on 2.6.18+ */
+static inline void drop_nlink(struct inode *inode)
+{
+       inode->i_nlink--;
+}
+static inline void inode_dec_link_count(struct inode *inode)
+{
+       drop_nlink(inode);
+       mark_inode_dirty(inode);
+}
 #endif /* _UNIONFS_COMPAT_H_ */

diff --git a/fs/unionfs/unlink.c b/fs/unionfs/unlink.c
index a1c82b6d2d8e08d0e25dfe1f52409ee2193a801e..1e370a1f21d3806412e63dc514e317b57f538857 100644 (file)
--- a/fs/unionfs/unlink.c
+++ b/fs/unionfs/unlink.c
@@ -79,7 +79,7 @@ static int unionfs_unlink_whiteout(struct inode *dir, struct dentry *dentry)
 
 out:
        if (!err)
-               dentry->d_inode->i_nlink--;
+               inode_dec_link_count(dentry->d_inode);
 
        /* We don't want to leave negative leftover dentries for revalidate. */
        if (!err && (dbopaque(dentry) != -1))