aboutsummaryrefslogtreecommitdiffstats
path: root/fs/jfs/namei.c
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@infradead.org>2010-03-03 09:05:07 -0500
committerJan Kara <jack@suse.cz>2010-03-04 18:20:30 -0500
commit871a293155a24554e153538d36e3a80fa169aefb (patch)
tree7e38f5a2f9e87f63cbc4bc1077a4bb49dde441b0 /fs/jfs/namei.c
parent907f4554e2521cb28b0009d17167760650a9561c (diff)
dquot: cleanup dquot initialize routine
Get rid of the initialize dquot operation - it is now always called from the filesystem and if a filesystem really needs it's own (which none currently does) it can just call into it's own routine directly. Rename the now static low-level dquot_initialize helper to __dquot_initialize and vfs_dq_init to dquot_initialize to have a consistent namespace. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/jfs/namei.c')
-rw-r--r--fs/jfs/namei.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/fs/jfs/namei.c b/fs/jfs/namei.c
index b7cc29da50b4..4a3e9f39c21d 100644
--- a/fs/jfs/namei.c
+++ b/fs/jfs/namei.c
@@ -85,7 +85,7 @@ static int jfs_create(struct inode *dip, struct dentry *dentry, int mode,
85 85
86 jfs_info("jfs_create: dip:0x%p name:%s", dip, dentry->d_name.name); 86 jfs_info("jfs_create: dip:0x%p name:%s", dip, dentry->d_name.name);
87 87
88 vfs_dq_init(dip); 88 dquot_initialize(dip);
89 89
90 /* 90 /*
91 * search parent directory for entry/freespace 91 * search parent directory for entry/freespace
@@ -217,7 +217,7 @@ static int jfs_mkdir(struct inode *dip, struct dentry *dentry, int mode)
217 217
218 jfs_info("jfs_mkdir: dip:0x%p name:%s", dip, dentry->d_name.name); 218 jfs_info("jfs_mkdir: dip:0x%p name:%s", dip, dentry->d_name.name);
219 219
220 vfs_dq_init(dip); 220 dquot_initialize(dip);
221 221
222 /* link count overflow on parent directory ? */ 222 /* link count overflow on parent directory ? */
223 if (dip->i_nlink == JFS_LINK_MAX) { 223 if (dip->i_nlink == JFS_LINK_MAX) {
@@ -360,8 +360,8 @@ static int jfs_rmdir(struct inode *dip, struct dentry *dentry)
360 jfs_info("jfs_rmdir: dip:0x%p name:%s", dip, dentry->d_name.name); 360 jfs_info("jfs_rmdir: dip:0x%p name:%s", dip, dentry->d_name.name);
361 361
362 /* Init inode for quota operations. */ 362 /* Init inode for quota operations. */
363 vfs_dq_init(dip); 363 dquot_initialize(dip);
364 vfs_dq_init(ip); 364 dquot_initialize(ip);
365 365
366 /* directory must be empty to be removed */ 366 /* directory must be empty to be removed */
367 if (!dtEmpty(ip)) { 367 if (!dtEmpty(ip)) {
@@ -488,8 +488,8 @@ static int jfs_unlink(struct inode *dip, struct dentry *dentry)
488 jfs_info("jfs_unlink: dip:0x%p name:%s", dip, dentry->d_name.name); 488 jfs_info("jfs_unlink: dip:0x%p name:%s", dip, dentry->d_name.name);
489 489
490 /* Init inode for quota operations. */ 490 /* Init inode for quota operations. */
491 vfs_dq_init(dip); 491 dquot_initialize(dip);
492 vfs_dq_init(ip); 492 dquot_initialize(ip);
493 493
494 if ((rc = get_UCSname(&dname, dentry))) 494 if ((rc = get_UCSname(&dname, dentry)))
495 goto out; 495 goto out;
@@ -811,7 +811,7 @@ static int jfs_link(struct dentry *old_dentry,
811 if (ip->i_nlink == 0) 811 if (ip->i_nlink == 0)
812 return -ENOENT; 812 return -ENOENT;
813 813
814 vfs_dq_init(dir); 814 dquot_initialize(dir);
815 815
816 tid = txBegin(ip->i_sb, 0); 816 tid = txBegin(ip->i_sb, 0);
817 817
@@ -904,7 +904,7 @@ static int jfs_symlink(struct inode *dip, struct dentry *dentry,
904 904
905 jfs_info("jfs_symlink: dip:0x%p name:%s", dip, name); 905 jfs_info("jfs_symlink: dip:0x%p name:%s", dip, name);
906 906
907 vfs_dq_init(dip); 907 dquot_initialize(dip);
908 908
909 ssize = strlen(name) + 1; 909 ssize = strlen(name) + 1;
910 910
@@ -1097,8 +1097,8 @@ static int jfs_rename(struct inode *old_dir, struct dentry *old_dentry,
1097 jfs_info("jfs_rename: %s %s", old_dentry->d_name.name, 1097 jfs_info("jfs_rename: %s %s", old_dentry->d_name.name,
1098 new_dentry->d_name.name); 1098 new_dentry->d_name.name);
1099 1099
1100 vfs_dq_init(old_dir); 1100 dquot_initialize(old_dir);
1101 vfs_dq_init(new_dir); 1101 dquot_initialize(new_dir);
1102 1102
1103 old_ip = old_dentry->d_inode; 1103 old_ip = old_dentry->d_inode;
1104 new_ip = new_dentry->d_inode; 1104 new_ip = new_dentry->d_inode;
@@ -1149,7 +1149,7 @@ static int jfs_rename(struct inode *old_dir, struct dentry *old_dentry,
1149 } else if (new_ip) { 1149 } else if (new_ip) {
1150 IWRITE_LOCK(new_ip, RDWRLOCK_NORMAL); 1150 IWRITE_LOCK(new_ip, RDWRLOCK_NORMAL);
1151 /* Init inode for quota operations. */ 1151 /* Init inode for quota operations. */
1152 vfs_dq_init(new_ip); 1152 dquot_initialize(new_ip);
1153 } 1153 }
1154 1154
1155 /* 1155 /*
@@ -1373,7 +1373,7 @@ static int jfs_mknod(struct inode *dir, struct dentry *dentry,
1373 1373
1374 jfs_info("jfs_mknod: %s", dentry->d_name.name); 1374 jfs_info("jfs_mknod: %s", dentry->d_name.name);
1375 1375
1376 vfs_dq_init(dir); 1376 dquot_initialize(dir);
1377 1377
1378 if ((rc = get_UCSname(&dname, dentry))) 1378 if ((rc = get_UCSname(&dname, dentry)))
1379 goto out; 1379 goto out;