UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

vfs: Use lowercase names of quota functions 

Use lowercase names of quota functions instead of old uppercase ones.

Signed-off-by: Jan Kara <jack@suse.cz>
CC: Alexander Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Jan Kara 2009-01-26 16:45:12 +01:00
parent d26ac1a812
commit 9e3509e273
6 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fs/attr.c
View File

@ -173,7 +173,8 @@ int notify_change(struct dentry * dentry, struct iattr * attr)
if (!error) { if (!error) {
if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) || if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) ||
(ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid)) (ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid))
error = DQUOT_TRANSFER(inode, attr) ? -EDQUOT : 0; error = vfs_dq_transfer(inode, attr) ?
-EDQUOT : 0;
if (!error) if (!error)
error = inode_setattr(inode, attr); error = inode_setattr(inode, attr);
} }

4
fs/inode.c
View File

@ -284,7 +284,7 @@ void clear_inode(struct inode *inode)
BUG_ON(!(inode->i_state & I_FREEING)); BUG_ON(!(inode->i_state & I_FREEING));
BUG_ON(inode->i_state & I_CLEAR); BUG_ON(inode->i_state & I_CLEAR);
inode_sync_wait(inode); inode_sync_wait(inode);
DQUOT_DROP(inode); vfs_dq_drop(inode);
if (inode->i_sb->s_op->clear_inode) if (inode->i_sb->s_op->clear_inode)
inode->i_sb->s_op->clear_inode(inode); inode->i_sb->s_op->clear_inode(inode);
if (S_ISBLK(inode->i_mode) && inode->i_bdev) if (S_ISBLK(inode->i_mode) && inode->i_bdev)
@ -1158,7 +1158,7 @@ void generic_delete_inode(struct inode *inode)
if (op->delete_inode) { if (op->delete_inode) {
void (*delete)(struct inode *) = op->delete_inode; void (*delete)(struct inode *) = op->delete_inode;
if (!is_bad_inode(inode)) if (!is_bad_inode(inode))
DQUOT_INIT(inode); vfs_dq_init(inode);
/* Filesystems implementing their own /* Filesystems implementing their own
* s_op->delete_inode are required to call * s_op->delete_inode are required to call
* truncate_inode_pages and clear_inode() * truncate_inode_pages and clear_inode()

22
fs/namei.c
View File

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

2
fs/open.c
View File

@ -273,7 +273,7 @@ static long do_sys_truncate(const char __user *pathname, loff_t length)
if (!error) if (!error)
error = security_path_truncate(&path, length, 0); error = security_path_truncate(&path, length, 0);
if (!error) { if (!error) {
DQUOT_INIT(inode); vfs_dq_init(inode);
error = do_truncate(path.dentry, length, 0, NULL); error = do_truncate(path.dentry, length, 0, NULL);
} }

8
fs/super.c
View File

@ -197,7 +197,7 @@ void deactivate_super(struct super_block *s)
if (atomic_dec_and_lock(&s->s_active, &sb_lock)) { if (atomic_dec_and_lock(&s->s_active, &sb_lock)) {
s->s_count -= S_BIAS-1; s->s_count -= S_BIAS-1;
spin_unlock(&sb_lock); spin_unlock(&sb_lock);
DQUOT_OFF(s, 0); vfs_dq_off(s, 0);
down_write(&s->s_umount); down_write(&s->s_umount);
fs->kill_sb(s); fs->kill_sb(s);
put_filesystem(fs); put_filesystem(fs);
@ -266,7 +266,7 @@ EXPORT_SYMBOL(unlock_super);
void __fsync_super(struct super_block *sb) void __fsync_super(struct super_block *sb)
{ {
sync_inodes_sb(sb, 0); sync_inodes_sb(sb, 0);
DQUOT_SYNC(sb); vfs_dq_sync(sb);
lock_super(sb); lock_super(sb);
if (sb->s_dirt && sb->s_op->write_super) if (sb->s_dirt && sb->s_op->write_super)
sb->s_op->write_super(sb); sb->s_op->write_super(sb);
@ -655,7 +655,7 @@ int do_remount_sb(struct super_block *sb, int flags, void *data, int force)
mark_files_ro(sb); mark_files_ro(sb);
else if (!fs_may_remount_ro(sb)) else if (!fs_may_remount_ro(sb))
return -EBUSY; return -EBUSY;
retval = DQUOT_OFF(sb, 1); retval = vfs_dq_off(sb, 1);
if (retval < 0 && retval != -ENOSYS) if (retval < 0 && retval != -ENOSYS)
return -EBUSY; return -EBUSY;
} }
@ -670,7 +670,7 @@ int do_remount_sb(struct super_block *sb, int flags, void *data, int force)
} }
sb->s_flags = (sb->s_flags & ~MS_RMT_MASK) | (flags & MS_RMT_MASK); sb->s_flags = (sb->s_flags & ~MS_RMT_MASK) | (flags & MS_RMT_MASK);
if (remount_rw) if (remount_rw)
DQUOT_ON_REMOUNT(sb); vfs_dq_quota_on_remount(sb);
return 0; return 0;
} }

2
fs/sync.c
View File

@ -25,7 +25,7 @@ static void do_sync(unsigned long wait)
{ {
wakeup_pdflush(0); wakeup_pdflush(0);
sync_inodes(0); /* All mappings, inodes and their blockdevs */ sync_inodes(0); /* All mappings, inodes and their blockdevs */
DQUOT_SYNC(NULL); vfs_dq_sync(NULL);
sync_supers(); /* Write the superblocks */ sync_supers(); /* Write the superblocks */
sync_filesystems(0); /* Start syncing the filesystems */ sync_filesystems(0); /* Start syncing the filesystems */
sync_filesystems(wait); /* Waitingly sync the filesystems */ sync_filesystems(wait); /* Waitingly sync the filesystems */