[PATCH 3 of 4] nfsd4: fix sync'ing of recovery directory

We need to fsync the recovery directory after writing to it, but we weren't
doing this correctly.  (For example, we weren't taking the i_sem when calling
->fsync().)

Just reuse the existing nfsd fsync code instead.

Signed-off-by: J. Bruce Fields <bfields <at> citi.umich.edu>
---

 linux-2.6.12-rc4-bfields/fs/nfsd/nfs4recover.c     |   29 +++++----------------
 linux-2.6.12-rc4-bfields/fs/nfsd/vfs.c             |    2 -
 linux-2.6.12-rc4-bfields/include/linux/nfsd/nfsd.h |    1 
 3 files changed, 10 insertions(+), 22 deletions(-)

diff -puN fs/nfsd/nfs4recover.c~nfsd4-sync-recovery-dir-fix fs/nfsd/nfs4recover.c
--- linux-2.6.12-rc4/fs/nfsd/nfs4recover.c~nfsd4-sync-recovery-dir-fix	2005-06-02
17:07:59.000000000 -0400
+++ linux-2.6.12-rc4-bfields/fs/nfsd/nfs4recover.c	2005-06-02 17:08:00.000000000 -0400
 <at>  <at>  -119,25 +119,12  <at>  <at>  out:
 	return status;
 }

-static int
-nfsd4_rec_fsync(struct dentry *dentry)
+static void
+nfsd4_sync_rec_dir(void)
 {
-	struct file *filp;
-	int status = nfs_ok;
-
-	dprintk("NFSD: nfs4_fsync_rec_dir\n");
-	filp = dentry_open(dget(dentry), mntget(rec_dir.mnt), O_RDWR);
-	if (IS_ERR(filp)) {
-		status = PTR_ERR(filp);
-		goto out;
-	}
-	if (filp->f_op && filp->f_op->fsync)
-		status = filp->f_op->fsync(filp, filp->f_dentry, 0);
-	fput(filp);
-out:
-	if (status)
-		printk("nfsd4: unable to sync recovery directory\n");
-	return status;
+	down(&rec_dir.dentry->d_inode->i_sem);
+	nfsd_sync_dir(rec_dir.dentry);
+	up(&rec_dir.dentry->d_inode->i_sem);
 }

 int
 <at>  <at>  -176,7 +163,7  <at>  <at>  out_unlock:
 	up(&rec_dir.dentry->d_inode->i_sem);
 	if (status == 0) {
 		clp->cl_firststate = 1;
-		status = nfsd4_rec_fsync(rec_dir.dentry);
+		nfsd4_sync_rec_dir();
 	}
 	nfs4_reset_user(uid, gid);
 	dprintk("NFSD: nfsd4_create_clid_dir returns %d\n", status);
 <at>  <at>  -331,7 +318,7  <at>  <at>  nfsd4_remove_clid_dir(struct nfs4_client
 	status = nfsd4_unlink_clid_dir(clp->cl_recdir, HEXDIR_LEN-1);
 	nfs4_reset_user(uid, gid);
 	if (status == 0)
-		status = nfsd4_rec_fsync(rec_dir.dentry);
+		nfsd4_sync_rec_dir();
 	if (status)
 		printk("NFSD: Failed to remove expired client state directory"
 				" %.*s\n", HEXDIR_LEN, clp->cl_recdir);
 <at>  <at>  -362,7 +349,7  <at>  <at>  nfsd4_recdir_purge_old(void) {
 		return;
 	status = nfsd4_list_rec_dir(rec_dir.dentry, purge_old);
 	if (status == 0)
-		status = nfsd4_rec_fsync(rec_dir.dentry);
+		nfsd4_sync_rec_dir();
 	if (status)
 		printk("nfsd4: failed to purge old clients from recovery"
 			" directory %s\n", rec_dir.dentry->d_name.name);
diff -puN fs/nfsd/vfs.c~nfsd4-sync-recovery-dir-fix fs/nfsd/vfs.c
--- linux-2.6.12-rc4/fs/nfsd/vfs.c~nfsd4-sync-recovery-dir-fix	2005-06-02 17:08:00.000000000 -0400
+++ linux-2.6.12-rc4-bfields/fs/nfsd/vfs.c	2005-06-02 17:08:00.000000000 -0400
 <at>  <at>  -735,7 +735,7  <at>  <at>  nfsd_sync(struct file *filp)
 	up(&inode->i_sem);
 }

-static void
+void
 nfsd_sync_dir(struct dentry *dp)
 {
 	nfsd_dosync(NULL, dp, dp->d_inode->i_fop);
diff -puN include/linux/nfsd/nfsd.h~nfsd4-sync-recovery-dir-fix include/linux/nfsd/nfsd.h
--- linux-2.6.12-rc4/include/linux/nfsd/nfsd.h~nfsd4-sync-recovery-dir-fix	2005-06-02
17:08:00.000000000 -0400
+++ linux-2.6.12-rc4-bfields/include/linux/nfsd/nfsd.h	2005-06-02 17:08:00.000000000 -0400
 <at>  <at>  -124,6 +124,7  <at>  <at>  int		nfsd_statfs(struct svc_rqst *, stru

 int		nfsd_notify_change(struct inode *, struct iattr *);
 int		nfsd_permission(struct svc_export *, struct dentry *, int);
+void		nfsd_sync_dir(struct dentry *dp);

 #if defined(CONFIG_NFSD_V2_ACL) || defined(CONFIG_NFSD_V3_ACL)
 #ifdef CONFIG_NFSD_V2_ACL
_