Skip to contentSkip to conversation

commit_metadata export operation v6

PATCH In review Ben Myers 4 participants 8 messages Feb 17, 2010 – Feb 23, 2010

Subsystems (4)
lore
Share & tools
lore

Ben Myers

author
#0 lore raw

cover commit_metadata export operation v6

Hey Bruce,

Here is the latest version of the knfsd sync changes. I have addressed the suggestions provided by Christoph, Trond, Dave, and Alex.

In this latest version I have fixed up the few nits in the nfsd patch that Christoph pointed out yesterday. I also have simplified the xfs patch as suggested by Dave.

Thanks,
Ben
---

Ben Myers (2):
commit_metadata export operation replacing nfsd_sync_dir xfs_export_operations.commit_metadata

 fs/nfsd/nfs4recover.c         |    4 --
 fs/nfsd/vfs.c                 |  106 ++++++++++++++++++++---------------------
 fs/xfs/linux-2.6/xfs_export.c |   20 ++++++++
 include/linux/exportfs.h      |    5 ++
 4 files changed, 78 insertions(+), 57 deletions(-)
Signature · 6 lines
Signature

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
author
#1 lore raw

PATCH 1/2 commit_metadata export operation replacing nfsd_sync_dir

- Add commit_metadata export_operation to allow the underlying filesystem to decide how to commit an inode most efficiently.

- Usage of nfsd_sync_dir and write_inode_now has been replaced with the commit_metadata function that takes a svc_fh.

- The commit_metadata function calls the commit_metadata export_op if it's there, or else falls back to sync_inode instead of fsync and write_inode_now because only metadata need be synced here.

- nfsd4_sync_rec_dir now uses vfs_fsync so that commit_metadata can be static

---
 fs/nfsd/nfs4recover.c    |    4 --
 fs/nfsd/vfs.c            |  106 +++++++++++++++++++++++-----------------------
 include/linux/exportfs.h |    5 ++
 3 files changed, 58 insertions(+), 57 deletions(-)
fs/nfsd/nfs4recover.c +1 -3
index 5a754f7..98fb98e 100644
@@ -119,9 +119,7 @@ out_no_tfm:
 static void
 nfsd4_sync_rec_dir(void)
 {
-	mutex_lock(&rec_dir.dentry->d_inode->i_mutex);
-	nfsd_sync_dir(rec_dir.dentry);
-	mutex_unlock(&rec_dir.dentry->d_inode->i_mutex);
+	vfs_fsync(NULL, rec_dir.dentry, 0);
 }
 
 int
fs/nfsd/vfs.c +52 -54

176 lines not on this page · raw message

include/linux/exportfs.h +5 -0
index dc12f41..a9cd507 100644
@@ -96,6 +96,7 @@ struct fid {
  * @fh_to_parent:   find the implied object's parent and get a dentry for it
  * @get_name:       find the name for a given inode in a given directory
  * @get_parent:     find the parent of a given directory
+ * @commit_metadata: commit metadata changes to stable storage
  *
  * See Documentation/filesystems/nfs/Exporting for details on how to use
  * this interface correctly.
@@ -137,6 +138,9 @@ struct fid {
  *    is also a directory.  In the event that it cannot be found, or storage
  *    space cannot be allocated, a %ERR_PTR should be returned.
  *
+ * commit_metadata:
+ *    @commit_metadata should commit metadata changes to stable storage.
+ *
  * Locking rules:
  *    get_parent is called with child->d_inode->i_mutex down
  *    get_name is not (which is possibly inconsistent)
@@ -152,6 +156,7 @@ struct export_operations {
 	int (*get_name)(struct dentry *parent, char *name,
 			struct dentry *child);
 	struct dentry * (*get_parent)(struct dentry *child);
+	int (*commit_metadata)(struct inode *inode);
 };
 
 extern int exportfs_encode_fh(struct dentry *dentry, struct fid *fid,

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

author
#2 lore raw

PATCH 2/2 xfs_export_operations.commit_metadata

In reply to Ben Myers

This is the commit_metadata export operation for XFS.

- Takes one inode to be committed.

- Forces the log up to the lsn of the inode.

- Doesn't force the log if the inode doesn't have a pincount.

---
 fs/xfs/linux-2.6/xfs_export.c |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)
fs/xfs/linux-2.6/xfs_export.c +20 -0
index 87b8cbd..8615d99 100644
@@ -29,6 +29,7 @@
 #include "xfs_vnodeops.h"
 #include "xfs_bmap_btree.h"
 #include "xfs_inode.h"
+#include "xfs_inode_item.h"
 
 /*
  * Note that we only accept fileids which are long enough rather than allow
@@ -215,9 +216,28 @@ xfs_fs_get_parent(
 	return d_obtain_alias(VFS_I(cip));
 }
 
+STATIC int
+xfs_fs_nfs_commit_metadata(
+	struct inode		*inode)
+{
+	struct xfs_inode	*ip = XFS_I(inode);
+	struct xfs_mount	*mp = ip->i_mount;
+	int			error = 0;
+
+	xfs_ilock(ip, XFS_ILOCK_SHARED);
+	if (xfs_ipincount(ip)) {
+		error = _xfs_log_force(mp, ip->i_itemp->ili_last_lsn,
+				XFS_LOG_FORCE | XFS_LOG_SYNC, NULL);
+	}
+	xfs_iunlock(ip, XFS_ILOCK_SHARED);
+	
+	return error;
+}
+
 const struct export_operations xfs_export_operations = {
 	.encode_fh		= xfs_fs_encode_fh,
 	.fh_to_dentry		= xfs_fs_fh_to_dentry,
 	.fh_to_parent		= xfs_fs_fh_to_parent,
 	.get_parent		= xfs_fs_get_parent,
+	.commit_metadata	= xfs_fs_nfs_commit_metadata,
 };

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

Reviewed-by on v1 2/2
#3 lore raw

Re: [PATCH 2/2] xfs_export_operations.commit_metadata

Quoted 10 lines · Ben Myers

This is the commit_metadata export operation for XFS.

- Takes one inode to be committed.

- Forces the log up to the lsn of the inode.

- Doesn't force the log if the inode doesn't have a pincount.

Looks good, Ben.

Signature · 7 lines
Dave Chinner
[email protected]

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
Reviewed-by on the v1 series
#4 lore raw
In reply to Ben Myers
Quoted 8 lines · Ben Myers

Hey Bruce,

Here is the latest version of the knfsd sync changes. I have addressed the suggestions provided by Christoph, Trond, Dave, and Alex.

In this latest version I have fixed up the few nits in the nfsd patch that Christoph pointed out yesterday. I also have simplified the xfs patch as suggested by Dave.

Both patches looks good to me,

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

#5 lore raw
In reply to Ben Myers
Quoted 8 lines · Ben Myers

Hey Bruce,

Here is the latest version of the knfsd sync changes. I have addressed the suggestions provided by Christoph, Trond, Dave, and Alex.

In this latest version I have fixed up the few nits in the nfsd patch that Christoph pointed out yesterday. I also have simplified the xfs patch as suggested by Dave.

Thanks, applying.

(Do you the second (xfs) patch to go in through the nfsd tree as well, or should that go in through xfs maintainers after the nfsd merge?)

--b.

Quoted 10 lines

Thanks,
Ben
---

Ben Myers (2):
commit_metadata export operation replacing nfsd_sync_dir xfs_export_operations.commit_metadata

Quoted 8 lines
 fs/nfsd/nfs4recover.c         |    4 --
 fs/nfsd/vfs.c                 |  106 ++++++++++++++++++++---------------------
 fs/xfs/linux-2.6/xfs_export.c |   20 ++++++++
 include/linux/exportfs.h      |    5 ++
 4 files changed, 78 insertions(+), 57 deletions(-)
Signature · 1 line
Signature

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

#6 lore raw

Hey Bruce,

Quoted 6 lines · J. Bruce Fields
Quoted 5 lines · Ben Myers

Hey Bruce,

Here is the latest version of the knfsd sync changes. I have addressed the suggestions provided by Christoph, Trond, Dave, and Alex.

Quoted 8 lines
Quoted 3 lines

In this latest version I have fixed up the few nits in the nfsd patch that Christoph pointed out yesterday. I also have simplified the xfs patch as suggested by Dave.

Thanks, applying.

(Do you the second (xfs) patch to go in through the nfsd tree as well, or should that go in through xfs maintainers after the nfsd merge?)

I chatted with Alex. It sounds like the best thing is for both patches to go in through the nfsd tree since they need to go in order.

Thanks,
Ben

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

#7 lore raw
Quoted 13 lines · On Mon, Feb 22, 2010 at 01:53:53PM -0600, [email protected] wrote:

Hey Bruce,

Quoted 10 lines · J. Bruce Fields
Quoted 8 lines · Ben Myers

Hey Bruce,

Here is the latest version of the knfsd sync changes. I have addressed the suggestions provided by Christoph, Trond, Dave, and Alex.

In this latest version I have fixed up the few nits in the nfsd patch that Christoph pointed out yesterday. I also have simplified the xfs patch as suggested by Dave.

Quoted 7 lines
Quoted 4 lines

Thanks, applying.

(Do you the second (xfs) patch to go in through the nfsd tree as well, or should that go in through xfs maintainers after the nfsd merge?)

I chatted with Alex. It sounds like the best thing is for both patches to go in through the nfsd tree since they need to go in order.

OK, thanks, committed.--b.

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs