Pull sim-fixes into release branch

[linux-2.6] / fs / nfsd / nfs4recover.c

diff --git a/fs/nfsd/nfs4recover.c b/fs/nfsd/nfs4recover.c
index 095f1740f3aeeb2b98939006f8e408d79311a5dc..954cf893d50c34513c8c7167173a479dc9eb026d 100644 (file)
--- a/fs/nfsd/nfs4recover.c
+++ b/fs/nfsd/nfs4recover.c
@@ -93,7 +93,7 @@ nfs4_make_rec_clidname(char *dname, struct xdr_netobj *clname)
 
        dprintk("NFSD: nfs4_make_rec_clidname for %.*s\n",
                        clname->len, clname->data);
-       tfm = crypto_alloc_tfm("md5", 0);
+       tfm = crypto_alloc_tfm("md5", CRYPTO_TFM_REQ_MAY_SLEEP);
        if (tfm == NULL)
                goto out;
        cksum.len = crypto_tfm_alg_digestsize(tfm);
@@ -114,30 +114,16 @@ nfs4_make_rec_clidname(char *dname, struct xdr_netobj *clname)
        kfree(cksum.data);
        status = nfs_ok;
 out:
-       if (tfm)
-               crypto_free_tfm(tfm);
+       crypto_free_tfm(tfm);
        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
@@ -176,7 +162,7 @@ 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);
@@ -302,7 +288,9 @@ nfsd4_unlink_clid_dir(char *name, int namlen)
 
        dprintk("NFSD: nfsd4_unlink_clid_dir. name %.*s\n", namlen, name);
 
+       down(&rec_dir.dentry->d_inode->i_sem);
        dentry = lookup_one_len(name, rec_dir.dentry, namlen);
+       up(&rec_dir.dentry->d_inode->i_sem);
        if (IS_ERR(dentry)) {
                status = PTR_ERR(dentry);
                return status;
@@ -327,11 +315,12 @@ nfsd4_remove_clid_dir(struct nfs4_client *clp)
        if (!rec_dir_init || !clp->cl_firststate)
                return;
 
+       clp->cl_firststate = 0;
        nfs4_save_user(&uid, &gid);
        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);
@@ -362,7 +351,7 @@ 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);