[Cluster-devel] [PATCH] gfs2: Fsync parent directories

[Andreas Gruenbacher <agruenba@redhat.com>]

When fsyncing a new file, also fsync the directory the files is in,
recursively.  This is how Linux filesystems should behave nowadays,
even if not mandated by POSIX.

Based on ext4 commits 14ece1028, d59729f4e, and 9f713878f.

Fixes xfstests generic/322, generic/376.

Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
---
 fs/gfs2/dir.c    |  3 ++-
 fs/gfs2/dir.h    |  2 +-
 fs/gfs2/file.c   | 37 +++++++++++++++++++++++++++++++++++++
 fs/gfs2/incore.h |  1 +
 4 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/fs/gfs2/dir.c b/fs/gfs2/dir.c
index 7c21aea..5dbcf9d 100644
--- a/fs/gfs2/dir.c
+++ b/fs/gfs2/dir.c
@@ -1797,7 +1797,7 @@ static u16 gfs2_inode_ra_len(const struct gfs2_inode *ip)
  */
 
 int gfs2_dir_add(struct inode *inode, const struct qstr *name,
-		 const struct gfs2_inode *nip, struct gfs2_diradd *da)
+		 struct gfs2_inode *nip, struct gfs2_diradd *da)
 {
 	struct gfs2_inode *ip = GFS2_I(inode);
 	struct buffer_head *bh = da->bh;
@@ -1832,6 +1832,7 @@ int gfs2_dir_add(struct inode *inode, const struct qstr *name,
 			ip->i_inode.i_mtime = ip->i_inode.i_ctime = tv;
 			if (S_ISDIR(nip->i_inode.i_mode))
 				inc_nlink(&ip->i_inode);
+			set_bit(GIF_NEWENTRY, &nip->i_flags);
 			mark_inode_dirty(inode);
 			error = 0;
 			break;
diff --git a/fs/gfs2/dir.h b/fs/gfs2/dir.h
index e1b309c..8c07423 100644
--- a/fs/gfs2/dir.h
+++ b/fs/gfs2/dir.h
@@ -32,7 +32,7 @@ extern struct inode *gfs2_dir_search(struct inode *dir,
 extern int gfs2_dir_check(struct inode *dir, const struct qstr *filename,
 			  const struct gfs2_inode *ip);
 extern int gfs2_dir_add(struct inode *inode, const struct qstr *filename,
-			const struct gfs2_inode *ip, struct gfs2_diradd *da);
+			struct gfs2_inode *ip, struct gfs2_diradd *da);
 static inline void gfs2_dir_no_add(struct gfs2_diradd *da)
 {
 	if (da->bh)
diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c
index 739a47c..9669991 100644
--- a/fs/gfs2/file.c
+++ b/fs/gfs2/file.c
@@ -631,6 +631,39 @@ static int gfs2_release(struct inode *inode, struct file *file)
 	return 0;
 }
 
+static int gfs2_sync_parent(struct inode *inode)
+{
+	struct gfs2_inode *ip = GFS2_I(inode);
+	int ret = 0;
+
+	if (!test_bit(GIF_NEWENTRY, &ip->i_flags))
+		return 0;
+	inode = igrab(inode);
+	while (test_bit(GIF_NEWENTRY, &ip->i_flags)) {
+		struct dentry *dentry;
+		struct inode *next;
+
+		clear_bit(GIF_NEWENTRY, &ip->i_flags);
+		dentry = d_find_any_alias(inode);
+		if (!dentry)
+			break;
+		next = igrab(d_inode(dentry->d_parent));
+		dput(dentry);
+		if (!next)
+			break;
+		iput(inode);
+		inode = next;
+		ip = GFS2_I(inode);
+
+		ret = sync_inode_metadata(inode, 1);
+		if (ret)
+			break;
+		gfs2_ail_flush(ip->i_gl, 1);
+	}
+	iput(inode);
+	return ret;
+}
+
 /**
  * gfs2_fsync - sync the dirty data for a file (across the cluster)
  * @file: the file that points to the dentry
@@ -683,6 +716,10 @@ static int gfs2_fsync(struct file *file, loff_t start, loff_t end,
 		gfs2_ail_flush(ip->i_gl, 1);
 	}
 
+	ret = gfs2_sync_parent(inode);
+	if (ret)
+		return ret;
+
 	if (mapping->nrpages)
 		ret = file_fdatawait_range(file, start, end);
 
diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h
index e0557b8..e81c5eb 100644
--- a/fs/gfs2/incore.h
+++ b/fs/gfs2/incore.h
@@ -386,6 +386,7 @@ enum {
 	GIF_ORDERED		= 4,
 	GIF_FREE_VFS_INODE      = 5,
 	GIF_GLOP_PENDING	= 6,
+	GIF_NEWENTRY		= 7,
 };
 
 struct gfs2_inode {
-- 
1.8.3.1