commit_metadata export operation v3
Subsystems (4)
cover commit_metadata export operation v3
Here is the latest version of the knfsd sync changes. I have addressed the suggestions provided by Christoph, Trond, and Dave.
Thanks,
Ben
---
Ben Myers (2):
commit_metadata export operation replacing nfsd_sync_dir xfs_export_operations.commit_metadata
fs/nfsd/nfs3proc.c | 2 - fs/nfsd/nfs4proc.c | 2 - fs/nfsd/nfs4recover.c | 4 - fs/nfsd/nfs4state.c | 2 - fs/nfsd/nfsproc.c | 4 + fs/nfsd/vfs.c | 116 +++++++++++++++++++---------------------- fs/nfsd/vfs.h | 3 - fs/xfs/linux-2.6/xfs_export.c | 43 +++++++++++++++ include/linux/exportfs.h | 6 ++ 9 files changed, 111 insertions(+), 71 deletions(-)
Signature · 4 lines
_______________________________________________ xfs mailing list [email protected] http://oss.sgi.com/mailman/listinfo/xfs
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 sync parent and child inodes most efficiently.
- Usage of nfsd_sync_dir and write_inode_now has been replaced with the commit_metadata function that takes a svc_fh and optional dentry for the child.
- 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 synched here.
- nfsd4_sync_rec_dir now uses vfs_fsync so that commit_metadata can be static
- Add a 'delay_commit' arg to nfsd_setattr so that callers of nfsd_create_setattr can commit parent and child together avoiding an extra sync.
--- fs/nfsd/nfs3proc.c | 2 - fs/nfsd/nfs4proc.c | 2 - fs/nfsd/nfs4recover.c | 4 -- fs/nfsd/nfs4state.c | 2 - fs/nfsd/nfsproc.c | 4 +- fs/nfsd/vfs.c | 116 ++++++++++++++++++++++------------------------ fs/nfsd/vfs.h | 3 - include/linux/exportfs.h | 6 ++ 8 files changed, 68 insertions(+), 71 deletions(-)
fs/nfsd/nfs3proc.c +1 -1
@@ -76,7 +76,7 @@ nfsd3_proc_setattr(struct svc_rqst *rqstp, struct nfsd3_sattrargs *argp,fh_copy (&resp->fh, &argp->fh); nfserr =nfsd_setattr (rqstp, &resp->fh, &argp->attrs, - argp->check_guard, argp->guardtime); + argp->check_guard, argp->guardtime,0 );RETURN_STATUS (nfserr); }
fs/nfsd/nfs4proc.c +1 -1
@@ -803,7 +803,7 @@ nfsd4_setattr(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,if (status) goto out; status =nfsd_setattr (rqstp, &cstate->current_fh, &setattr->sa_iattr, -0 , (time_t )0 ); +0 ,0 ,0 ); out:mnt_drop_write (cstate->current_fh.fh_export->ex_path.mnt);return status;
fs/nfsd/nfs4recover.c +1 -3
@@ -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/nfs4state.c +1 -1
@@ -2290,7 +2290,7 @@ nfsd4_truncate(struct svc_rqst *rqstp, struct svc_fh *fh,return 0 ;if (!(open->op_share_access &NFS4_SHARE_ACCESS_WRITE ))return nfserr_inval; -return nfsd_setattr (rqstp, fh, &iattr,0 , (time_t )0 ); +return nfsd_setattr (rqstp, fh, &iattr,0 ,0 ,0 ); } static __be32
fs/nfsd/nfsproc.c +2 -2
@@ -69,7 +69,7 @@ nfsd_proc_setattr(struct svc_rqst *rqstp, struct nfsd_sattrargs *argp, argp->attrs.ia_valid, (long) argp->attrs.ia_size);fh_copy (&resp->fh, &argp->fh); - nfserr =nfsd_setattr (rqstp, &resp->fh, &argp->attrs,0 , (time_t )0 ); + nfserr =nfsd_setattr (rqstp, &resp->fh, &argp->attrs,0 ,0 ,0 );return nfsd_return_attrs (nfserr, resp); }
@@ -326,7 +326,7 @@ nfsd_proc_create(struct svc_rqst *rqstp, struct nfsd_createargs *argp,*/ attr->ia_valid &=ATTR_SIZE ;if (attr->ia_valid) - nfserr =nfsd_setattr (rqstp, newfhp, attr,0 , (time_t )0 ); + nfserr =nfsd_setattr (rqstp, newfhp, attr,0 ,0 ,0 ); } out_unlock:
fs/nfsd/vfs.c +55 -61
203 lines not on this page · raw message
fs/nfsd/vfs.h +1 -2
@@ -41,7 +41,7 @@ __be32 nfsd_lookup_dentry(struct svc_rqst *, struct svc_fh *, const char *, unsigned int, struct svc_export **, struct dentry **);__be32 nfsd_setattr (struct svc_rqst *,struct svc_fh *, -struct iattr *,int ,time_t ); +struct iattr *,int ,time_t ,int );int nfsd_mountpoint (struct dentry *,struct svc_export *);#ifdef CONFIG_NFSD_V4 __be32 nfsd4_set_nfs4_acl(struct svc_rqst *, struct svc_fh *,
@@ -91,7 +91,6 @@ __be32 nfsd_statfs(struct svc_rqst *, struct svc_fh *,int nfsd_notify_change (struct inode *,struct iattr *);__be32 nfsd_permission (struct svc_rqst *,struct svc_export *,struct dentry *,int ); -int nfsd_sync_dir (struct dentry *dp);#if defined(CONFIG_NFSD_V2_ACL ) || defined(CONFIG_NFSD_V3_ACL )struct posix_acl *nfsd_get_posix_acl (struct svc_fh *,int );
include/linux/exportfs.h +6 -0
@@ -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,10 @@ 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. +* Parent or child can be NULL. +* * Locking rules: * get_parent is called with child->d_inode->i_mutex down * get_name is not (which is possibly inconsistent)
@@ -152,6 +157,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 *parent,struct inode *child); }; extern int exportfs_encode_fh(struct dentry *dentry, struct fid *fid,
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
PATCH 2/2 xfs_export_operations.commit_metadata
In reply to Ben MyersThis is the commit_metadata export operation for XFS, including the changes suggested by hch and dgc:
- Takes two two inodes instead of dentries and can assume the parent is always set.
- Uses xfs_lock_two_inodes for the ilock.
- Forces the log up to the larger lsn of parent and child.
- Uses XFS_LSN_CMP for lsn comparison.
- Doesn't force the log if nobody had a pincount.
--- fs/xfs/linux-2.6/xfs_export.c | 43 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 43 insertions(+), 0 deletions(-)
fs/xfs/linux-2.6/xfs_export.c +43 -0
@@ -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,51 @@ xfs_fs_get_parent(return d_obtain_alias (VFS_I (cip)); } +STATIC int +xfs_fs_nfs_commit_metadata ( +struct inode *parent, +struct inode *child) +{ +struct xfs_inode *dp =XFS_I (parent); +struct xfs_inode *ip =NULL ; +struct xfs_mount *mp = dp->i_mount; +xfs_lsn_t force_lsn =NULLCOMMITLSN ; +int error =0 ; + +if (child) { + ip =XFS_I (child); +xfs_lock_two_inodes (dp, ip,XFS_ILOCK_SHARED ); + }else { +xfs_ilock (dp,XFS_ILOCK_SHARED ); + } + +if (xfs_ipincount (dp)) { + force_lsn = dp->i_itemp->ili_last_lsn; +if (ip &&xfs_ipincount (ip) && +XFS_LSN_CMP (force_lsn, ip->i_itemp->ili_last_lsn) <0 ) { + force_lsn = ip->i_itemp->ili_last_lsn; + } + }else if (ip &&xfs_ipincount (ip)) { + force_lsn = ip->i_itemp->ili_last_lsn; + } + +if (force_lsn !=NULLCOMMITLSN ) { + error =_xfs_log_force (mp, force_lsn, +XFS_LOG_FORCE |XFS_LOG_SYNC ,NULL ); + } + +if (child) +xfs_iunlock (ip,XFS_ILOCK_SHARED ); +if (parent) +xfs_iunlock (dp,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
Quoted 5 lines · Ben Myers
Here is the latest version of the knfsd sync changes. I have addressed the suggestions provided by Christoph, Trond, and Dave.
Thanks,
Ben
Hi Ben,
This looks good to me, but before you send it on to Bruce, you might want to try rebasing this against his for-2.6.34 branch. That branch contains the stuff that is queued up for the next merge window, and includes Christoph's vfs_fsync() changes and my vfs_fsync_range() change to nfsd_commit().
See
http://git.linux-nfs.org/?p=bfields/linux.git;a=shortlog;h=refs/heads/for-2.6.34
Cheers
Trond
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs