Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[cascardo/linux.git] / fs / ocfs2 / dlmfs / dlmfs.c

diff --git a/fs/ocfs2/dlmfs/dlmfs.c b/fs/ocfs2/dlmfs/dlmfs.c
index f0d9763..1079fae 100644 (file)
--- a/fs/ocfs2/dlmfs/dlmfs.c
+++ b/fs/ocfs2/dlmfs/dlmfs.c
@@ -211,7 +211,7 @@ static int dlmfs_file_setattr(struct dentry *dentry, struct iattr *attr)
        struct inode *inode = d_inode(dentry);
 
        attr->ia_valid &= ~ATTR_SIZE;
        struct inode *inode = d_inode(dentry);
 
        attr->ia_valid &= ~ATTR_SIZE;

-       error = inode_change_ok(inode, attr);
+       error = setattr_prepare(dentry, attr);

        if (error)
                return error;
 
        if (error)
                return error;
 


@@ -646,7 +646,7 @@ static int __init init_dlmfs_fs(void)
        }
        cleanup_inode = 1;
 
        }
        cleanup_inode = 1;
 

-       user_dlm_worker = create_singlethread_workqueue("user_dlm");
+       user_dlm_worker = alloc_workqueue("user_dlm", WQ_MEM_RECLAIM, 0);

        if (!user_dlm_worker) {
                status = -ENOMEM;
                goto bail;
        if (!user_dlm_worker) {
                status = -ENOMEM;
                goto bail;