|
@@ -1470,7 +1470,7 @@ int vfs_create(struct inode *dir, struct dentry *dentry, int mode,
|
|
|
error = security_inode_create(dir, dentry, mode);
|
|
|
if (error)
|
|
|
return error;
|
|
|
- DQUOT_INIT(dir);
|
|
|
+ vfs_dq_init(dir);
|
|
|
error = dir->i_op->create(dir, dentry, mode, nd);
|
|
|
if (!error)
|
|
|
fsnotify_create(dir, dentry);
|
|
@@ -1544,7 +1544,7 @@ int may_open(struct path *path, int acc_mode, int flag)
|
|
|
error = security_path_truncate(path, 0,
|
|
|
ATTR_MTIME|ATTR_CTIME|ATTR_OPEN);
|
|
|
if (!error) {
|
|
|
- DQUOT_INIT(inode);
|
|
|
+ vfs_dq_init(inode);
|
|
|
|
|
|
error = do_truncate(dentry, 0,
|
|
|
ATTR_MTIME|ATTR_CTIME|ATTR_OPEN,
|
|
@@ -1555,7 +1555,7 @@ int may_open(struct path *path, int acc_mode, int flag)
|
|
|
return error;
|
|
|
} else
|
|
|
if (flag & FMODE_WRITE)
|
|
|
- DQUOT_INIT(inode);
|
|
|
+ vfs_dq_init(inode);
|
|
|
|
|
|
return 0;
|
|
|
}
|
|
@@ -1938,7 +1938,7 @@ int vfs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t dev)
|
|
|
if (error)
|
|
|
return error;
|
|
|
|
|
|
- DQUOT_INIT(dir);
|
|
|
+ vfs_dq_init(dir);
|
|
|
error = dir->i_op->mknod(dir, dentry, mode, dev);
|
|
|
if (!error)
|
|
|
fsnotify_create(dir, dentry);
|
|
@@ -2037,7 +2037,7 @@ int vfs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
|
|
|
if (error)
|
|
|
return error;
|
|
|
|
|
|
- DQUOT_INIT(dir);
|
|
|
+ vfs_dq_init(dir);
|
|
|
error = dir->i_op->mkdir(dir, dentry, mode);
|
|
|
if (!error)
|
|
|
fsnotify_mkdir(dir, dentry);
|
|
@@ -2123,7 +2123,7 @@ int vfs_rmdir(struct inode *dir, struct dentry *dentry)
|
|
|
if (!dir->i_op->rmdir)
|
|
|
return -EPERM;
|
|
|
|
|
|
- DQUOT_INIT(dir);
|
|
|
+ vfs_dq_init(dir);
|
|
|
|
|
|
mutex_lock(&dentry->d_inode->i_mutex);
|
|
|
dentry_unhash(dentry);
|
|
@@ -2210,7 +2210,7 @@ int vfs_unlink(struct inode *dir, struct dentry *dentry)
|
|
|
if (!dir->i_op->unlink)
|
|
|
return -EPERM;
|
|
|
|
|
|
- DQUOT_INIT(dir);
|
|
|
+ vfs_dq_init(dir);
|
|
|
|
|
|
mutex_lock(&dentry->d_inode->i_mutex);
|
|
|
if (d_mountpoint(dentry))
|
|
@@ -2321,7 +2321,7 @@ int vfs_symlink(struct inode *dir, struct dentry *dentry, const char *oldname)
|
|
|
if (error)
|
|
|
return error;
|
|
|
|
|
|
- DQUOT_INIT(dir);
|
|
|
+ vfs_dq_init(dir);
|
|
|
error = dir->i_op->symlink(dir, dentry, oldname);
|
|
|
if (!error)
|
|
|
fsnotify_create(dir, dentry);
|
|
@@ -2405,7 +2405,7 @@ int vfs_link(struct dentry *old_dentry, struct inode *dir, struct dentry *new_de
|
|
|
return error;
|
|
|
|
|
|
mutex_lock(&inode->i_mutex);
|
|
|
- DQUOT_INIT(dir);
|
|
|
+ vfs_dq_init(dir);
|
|
|
error = dir->i_op->link(old_dentry, dir, new_dentry);
|
|
|
mutex_unlock(&inode->i_mutex);
|
|
|
if (!error)
|
|
@@ -2604,8 +2604,8 @@ int vfs_rename(struct inode *old_dir, struct dentry *old_dentry,
|
|
|
if (!old_dir->i_op->rename)
|
|
|
return -EPERM;
|
|
|
|
|
|
- DQUOT_INIT(old_dir);
|
|
|
- DQUOT_INIT(new_dir);
|
|
|
+ vfs_dq_init(old_dir);
|
|
|
+ vfs_dq_init(new_dir);
|
|
|
|
|
|
old_name = fsnotify_oldname_init(old_dentry->d_name.name);
|
|
|
|