[PATCH] 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@citi.umich.edu> Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
463090294e
commit
a6ccbbb886
|
@ -119,25 +119,12 @@ out:
|
||||||
return status;
|
return status;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static void
|
||||||
nfsd4_rec_fsync(struct dentry *dentry)
|
nfsd4_sync_rec_dir(void)
|
||||||
{
|
{
|
||||||
struct file *filp;
|
down(&rec_dir.dentry->d_inode->i_sem);
|
||||||
int status = nfs_ok;
|
nfsd_sync_dir(rec_dir.dentry);
|
||||||
|
up(&rec_dir.dentry->d_inode->i_sem);
|
||||||
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;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
|
@ -176,7 +163,7 @@ out_unlock:
|
||||||
up(&rec_dir.dentry->d_inode->i_sem);
|
up(&rec_dir.dentry->d_inode->i_sem);
|
||||||
if (status == 0) {
|
if (status == 0) {
|
||||||
clp->cl_firststate = 1;
|
clp->cl_firststate = 1;
|
||||||
status = nfsd4_rec_fsync(rec_dir.dentry);
|
nfsd4_sync_rec_dir();
|
||||||
}
|
}
|
||||||
nfs4_reset_user(uid, gid);
|
nfs4_reset_user(uid, gid);
|
||||||
dprintk("NFSD: nfsd4_create_clid_dir returns %d\n", status);
|
dprintk("NFSD: nfsd4_create_clid_dir returns %d\n", status);
|
||||||
|
@ -331,7 +318,7 @@ nfsd4_remove_clid_dir(struct nfs4_client *clp)
|
||||||
status = nfsd4_unlink_clid_dir(clp->cl_recdir, HEXDIR_LEN-1);
|
status = nfsd4_unlink_clid_dir(clp->cl_recdir, HEXDIR_LEN-1);
|
||||||
nfs4_reset_user(uid, gid);
|
nfs4_reset_user(uid, gid);
|
||||||
if (status == 0)
|
if (status == 0)
|
||||||
status = nfsd4_rec_fsync(rec_dir.dentry);
|
nfsd4_sync_rec_dir();
|
||||||
if (status)
|
if (status)
|
||||||
printk("NFSD: Failed to remove expired client state directory"
|
printk("NFSD: Failed to remove expired client state directory"
|
||||||
" %.*s\n", HEXDIR_LEN, clp->cl_recdir);
|
" %.*s\n", HEXDIR_LEN, clp->cl_recdir);
|
||||||
|
@ -362,7 +349,7 @@ nfsd4_recdir_purge_old(void) {
|
||||||
return;
|
return;
|
||||||
status = nfsd4_list_rec_dir(rec_dir.dentry, purge_old);
|
status = nfsd4_list_rec_dir(rec_dir.dentry, purge_old);
|
||||||
if (status == 0)
|
if (status == 0)
|
||||||
status = nfsd4_rec_fsync(rec_dir.dentry);
|
nfsd4_sync_rec_dir();
|
||||||
if (status)
|
if (status)
|
||||||
printk("nfsd4: failed to purge old clients from recovery"
|
printk("nfsd4: failed to purge old clients from recovery"
|
||||||
" directory %s\n", rec_dir.dentry->d_name.name);
|
" directory %s\n", rec_dir.dentry->d_name.name);
|
||||||
|
|
|
@ -733,7 +733,7 @@ nfsd_sync(struct file *filp)
|
||||||
up(&inode->i_sem);
|
up(&inode->i_sem);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
void
|
||||||
nfsd_sync_dir(struct dentry *dp)
|
nfsd_sync_dir(struct dentry *dp)
|
||||||
{
|
{
|
||||||
nfsd_dosync(NULL, dp, dp->d_inode->i_fop);
|
nfsd_dosync(NULL, dp, dp->d_inode->i_fop);
|
||||||
|
|
|
@ -124,6 +124,7 @@ int nfsd_statfs(struct svc_rqst *, struct svc_fh *,
|
||||||
|
|
||||||
int nfsd_notify_change(struct inode *, struct iattr *);
|
int nfsd_notify_change(struct inode *, struct iattr *);
|
||||||
int nfsd_permission(struct svc_export *, struct dentry *, int);
|
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)
|
#if defined(CONFIG_NFSD_V2_ACL) || defined(CONFIG_NFSD_V3_ACL)
|
||||||
#ifdef CONFIG_NFSD_V2_ACL
|
#ifdef CONFIG_NFSD_V2_ACL
|
||||||
|
|
Loading…
Reference in a new issue