diff options
Diffstat (limited to 'fs/namei.c')
-rw-r--r-- | fs/namei.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/fs/namei.c b/fs/namei.c index bbc15c237558..8937f4e78178 100644 --- a/fs/namei.c +++ b/fs/namei.c | |||
@@ -1470,7 +1470,7 @@ int vfs_create(struct inode *dir, struct dentry *dentry, int mode, | |||
1470 | error = security_inode_create(dir, dentry, mode); | 1470 | error = security_inode_create(dir, dentry, mode); |
1471 | if (error) | 1471 | if (error) |
1472 | return error; | 1472 | return error; |
1473 | DQUOT_INIT(dir); | 1473 | vfs_dq_init(dir); |
1474 | error = dir->i_op->create(dir, dentry, mode, nd); | 1474 | error = dir->i_op->create(dir, dentry, mode, nd); |
1475 | if (!error) | 1475 | if (!error) |
1476 | fsnotify_create(dir, dentry); | 1476 | fsnotify_create(dir, dentry); |
@@ -1544,7 +1544,7 @@ int may_open(struct path *path, int acc_mode, int flag) | |||
1544 | error = security_path_truncate(path, 0, | 1544 | error = security_path_truncate(path, 0, |
1545 | ATTR_MTIME|ATTR_CTIME|ATTR_OPEN); | 1545 | ATTR_MTIME|ATTR_CTIME|ATTR_OPEN); |
1546 | if (!error) { | 1546 | if (!error) { |
1547 | DQUOT_INIT(inode); | 1547 | vfs_dq_init(inode); |
1548 | 1548 | ||
1549 | error = do_truncate(dentry, 0, | 1549 | error = do_truncate(dentry, 0, |
1550 | ATTR_MTIME|ATTR_CTIME|ATTR_OPEN, | 1550 | ATTR_MTIME|ATTR_CTIME|ATTR_OPEN, |
@@ -1555,7 +1555,7 @@ int may_open(struct path *path, int acc_mode, int flag) | |||
1555 | return error; | 1555 | return error; |
1556 | } else | 1556 | } else |
1557 | if (flag & FMODE_WRITE) | 1557 | if (flag & FMODE_WRITE) |
1558 | DQUOT_INIT(inode); | 1558 | vfs_dq_init(inode); |
1559 | 1559 | ||
1560 | return 0; | 1560 | return 0; |
1561 | } | 1561 | } |
@@ -1938,7 +1938,7 @@ int vfs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t dev) | |||
1938 | if (error) | 1938 | if (error) |
1939 | return error; | 1939 | return error; |
1940 | 1940 | ||
1941 | DQUOT_INIT(dir); | 1941 | vfs_dq_init(dir); |
1942 | error = dir->i_op->mknod(dir, dentry, mode, dev); | 1942 | error = dir->i_op->mknod(dir, dentry, mode, dev); |
1943 | if (!error) | 1943 | if (!error) |
1944 | fsnotify_create(dir, dentry); | 1944 | fsnotify_create(dir, dentry); |
@@ -2037,7 +2037,7 @@ int vfs_mkdir(struct inode *dir, struct dentry *dentry, int mode) | |||
2037 | if (error) | 2037 | if (error) |
2038 | return error; | 2038 | return error; |
2039 | 2039 | ||
2040 | DQUOT_INIT(dir); | 2040 | vfs_dq_init(dir); |
2041 | error = dir->i_op->mkdir(dir, dentry, mode); | 2041 | error = dir->i_op->mkdir(dir, dentry, mode); |
2042 | if (!error) | 2042 | if (!error) |
2043 | fsnotify_mkdir(dir, dentry); | 2043 | fsnotify_mkdir(dir, dentry); |
@@ -2123,7 +2123,7 @@ int vfs_rmdir(struct inode *dir, struct dentry *dentry) | |||
2123 | if (!dir->i_op->rmdir) | 2123 | if (!dir->i_op->rmdir) |
2124 | return -EPERM; | 2124 | return -EPERM; |
2125 | 2125 | ||
2126 | DQUOT_INIT(dir); | 2126 | vfs_dq_init(dir); |
2127 | 2127 | ||
2128 | mutex_lock(&dentry->d_inode->i_mutex); | 2128 | mutex_lock(&dentry->d_inode->i_mutex); |
2129 | dentry_unhash(dentry); | 2129 | dentry_unhash(dentry); |
@@ -2210,7 +2210,7 @@ int vfs_unlink(struct inode *dir, struct dentry *dentry) | |||
2210 | if (!dir->i_op->unlink) | 2210 | if (!dir->i_op->unlink) |
2211 | return -EPERM; | 2211 | return -EPERM; |
2212 | 2212 | ||
2213 | DQUOT_INIT(dir); | 2213 | vfs_dq_init(dir); |
2214 | 2214 | ||
2215 | mutex_lock(&dentry->d_inode->i_mutex); | 2215 | mutex_lock(&dentry->d_inode->i_mutex); |
2216 | if (d_mountpoint(dentry)) | 2216 | if (d_mountpoint(dentry)) |
@@ -2321,7 +2321,7 @@ int vfs_symlink(struct inode *dir, struct dentry *dentry, const char *oldname) | |||
2321 | if (error) | 2321 | if (error) |
2322 | return error; | 2322 | return error; |
2323 | 2323 | ||
2324 | DQUOT_INIT(dir); | 2324 | vfs_dq_init(dir); |
2325 | error = dir->i_op->symlink(dir, dentry, oldname); | 2325 | error = dir->i_op->symlink(dir, dentry, oldname); |
2326 | if (!error) | 2326 | if (!error) |
2327 | fsnotify_create(dir, dentry); | 2327 | fsnotify_create(dir, dentry); |
@@ -2405,7 +2405,7 @@ int vfs_link(struct dentry *old_dentry, struct inode *dir, struct dentry *new_de | |||
2405 | return error; | 2405 | return error; |
2406 | 2406 | ||
2407 | mutex_lock(&inode->i_mutex); | 2407 | mutex_lock(&inode->i_mutex); |
2408 | DQUOT_INIT(dir); | 2408 | vfs_dq_init(dir); |
2409 | error = dir->i_op->link(old_dentry, dir, new_dentry); | 2409 | error = dir->i_op->link(old_dentry, dir, new_dentry); |
2410 | mutex_unlock(&inode->i_mutex); | 2410 | mutex_unlock(&inode->i_mutex); |
2411 | if (!error) | 2411 | if (!error) |
@@ -2604,8 +2604,8 @@ int vfs_rename(struct inode *old_dir, struct dentry *old_dentry, | |||
2604 | if (!old_dir->i_op->rename) | 2604 | if (!old_dir->i_op->rename) |
2605 | return -EPERM; | 2605 | return -EPERM; |
2606 | 2606 | ||
2607 | DQUOT_INIT(old_dir); | 2607 | vfs_dq_init(old_dir); |
2608 | DQUOT_INIT(new_dir); | 2608 | vfs_dq_init(new_dir); |
2609 | 2609 | ||
2610 | old_name = fsnotify_oldname_init(old_dentry->d_name.name); | 2610 | old_name = fsnotify_oldname_init(old_dentry->d_name.name); |
2611 | 2611 | ||