Remove dead quota code
Subsystems (3)
Jan Kara
reviewercover Remove dead quota code
Two patches below remove dead quota code from UFS and UDF. Quota is
non-functional (quotaon fails) for these filesystems for several years and noone complained AFAIK. Also the main purpose of these filesystems is interoperability with other systems and quota support is linux-specific so it does not make too much sense. So remove the dead code...
Honza
Jan Kara
reviewerPATCH 1/2 udf: Remove dead quota code
Quota on UDF is non-functional at least since 2.6.16 (I'm too lazy to do more archeology) because it does not provide .quota_write and .quota_read functions and thus quotaon(8) just returns EINVAL. Since nobody complained for all those years and quota support is not even in UDF standard just nuke it.
--- fs/udf/balloc.c | 43 ++----------------------------------------- fs/udf/file.c | 26 +------------------------- fs/udf/ialloc.c | 21 +-------------------- fs/udf/inode.c | 5 ----- fs/udf/namei.c | 20 -------------------- fs/udf/super.c | 18 ++---------------- fs/udf/udfdecl.h | 1 - 7 files changed, 6 insertions(+), 128 deletions(-)
fs/udf/balloc.c +2 -41
@@ -21,7 +21,6 @@#include "udfdecl.h" -#include <linux/quotaops.h> #include <linux/buffer_head.h> #include <linux/bitops.h>
@@ -159,8 +158,6 @@ static void udf_bitmap_free_blocks(struct super_block *sb,udf_debug ("byte=%2x\n" , ((char *)bh->b_data)[(bit + i) >>3 ]); }else { -if (inode) -dquot_free_block (inode,1 );udf_add_free_space (sb, sbi->s_partition,1 ); } }
@@ -210,15 +207,8 @@ static int udf_bitmap_prealloc_blocks(struct super_block *sb, bit = block % (sb->s_blocksize <<3 );while (bit < (sb->s_blocksize <<3 ) && block_count >0 ) { -if (!udf_test_bit (bit, bh->b_data)) +if (!udf_clear_bit (bit, bh->b_data)) goto out; -else if (dquot_prealloc_block (inode,1 )) - goto out; -else if (!udf_clear_bit (bit, bh->b_data)) { -udf_debug ("bit already cleared for block %d\n" , bit); -dquot_free_block (inode,1 ); - goto out; - } block_count--; alloc_count++; bit++;
@@ -338,20 +328,6 @@ search_back: } got_block: - -/* -* Check quota for allocation of this block. -*/ -if (inode) { -int ret =dquot_alloc_block (inode,1 ); - -if (ret) { -mutex_unlock (&sbi->s_alloc_mutex); - *err = ret; -return 0 ; - } - } - newblock = bit + (block_group << (sb->s_blocksize_bits +3 )) - (sizeof (struct spaceBitmapDesc ) <<3 );
@@ -401,10 +377,6 @@ static void udf_table_free_blocks(struct super_block *sb, } iinfo =UDF_I (table); -/* We do this up front - There are some error conditions that -could occure, but.. oh well */ -if (inode) -dquot_free_block (inode, count);udf_add_free_space (sb, sbi->s_partition, count); start = bloc->logicalBlockNum + offset;
@@ -649,10 +621,7 @@ static int udf_table_prealloc_blocks(struct super_block *sb, epos.offset -= adsize; alloc_count = (elen >> sb->s_blocksize_bits); -if (inode &&dquot_prealloc_block (inode, - alloc_count > block_count ? block_count : alloc_count)) - alloc_count =0 ; -else if (alloc_count > block_count) { +if (alloc_count > block_count) { alloc_count = block_count; eloc.logicalBlockNum += alloc_count; elen -= (alloc_count << sb->s_blocksize_bits);
@@ -752,14 +721,6 @@ static int udf_table_new_block(struct super_block *sb, newblock = goal_eloc.logicalBlockNum; goal_eloc.logicalBlockNum++; goal_elen -= sb->s_blocksize; -if (inode) { - *err =dquot_alloc_block (inode,1 ); -if (*err) { -brelse (goal_epos.bh); -mutex_unlock (&sbi->s_alloc_mutex); -return 0 ; - } - }if (goal_elen)udf_write_aext (table, &goal_epos, &goal_eloc, goal_elen,1 );
fs/udf/file.c +1 -25
@@ -34,7 +34,6 @@#include <linux/errno.h> #include <linux/smp_lock.h> #include <linux/pagemap.h> -#include <linux/quotaops.h> #include <linux/buffer_head.h> #include <linux/aio.h>
@@ -208,7 +207,7 @@ const struct file_operations udf_file_operations = { .read = do_sync_read, .aio_read = generic_file_aio_read, .ioctl = udf_ioctl, - .open = dquot_file_open, + .open = generic_file_open, .mmap = generic_file_mmap, .write = do_sync_write, .aio_write = udf_file_aio_write,
@@ -218,29 +217,6 @@ const struct file_operations udf_file_operations = { .llseek = generic_file_llseek, }; -int udf_setattr (struct dentry *dentry,struct iattr *iattr) -{ -struct inode *inode = dentry->d_inode; -int error; - - error =inode_change_ok (inode, iattr); -if (error) -return error; - -if (is_quota_modification (inode, iattr)) -dquot_initialize (inode); - -if ((iattr->ia_valid &ATTR_UID && iattr->ia_uid != inode->i_uid) || - (iattr->ia_valid &ATTR_GID && iattr->ia_gid != inode->i_gid)) { - error =dquot_transfer (inode, iattr); -if (error) -return error; - } - -return inode_setattr (inode, iattr); -} -const struct inode_operations udf_file_inode_operations = { .truncate = udf_truncate, - .setattr = udf_setattr, };
fs/udf/ialloc.c +1 -20
@@ -20,7 +20,6 @@#include "udfdecl.h" #include <linux/fs.h> -#include <linux/quotaops.h> #include <linux/sched.h> #include <linux/slab.h>
@@ -32,13 +31,6 @@ void udf_free_inode(struct inode *inode)struct super_block *sb = inode->i_sb;struct udf_sb_info *sbi =UDF_SB (sb); -/* -* Note: we must free any quota before locking the superblock, -* as writing the quota to disk may need the lock as well. -*/ -dquot_free_inode (inode); -dquot_drop (inode); -clear_inode (inode);mutex_lock (&sbi->s_alloc_mutex);
@@ -61,7 +53,7 @@ struct inode *udf_new_inode(struct inode *dir, int mode, int *err)struct super_block *sb = dir->i_sb;struct udf_sb_info *sbi =UDF_SB (sb);struct inode *inode; -int block, ret; +int block;uint32_t start =UDF_I (dir)->i_location.logicalBlockNum;struct udf_inode_info *iinfo;struct udf_inode_info *dinfo =UDF_I (dir);
@@ -153,17 +145,6 @@ struct inode *udf_new_inode(struct inode *dir, int mode, int *err)insert_inode_hash (inode);mark_inode_dirty (inode); -dquot_initialize (inode); - ret =dquot_alloc_inode (inode); -if (ret) { -dquot_drop (inode); - inode->i_flags |=S_NOQUOTA ; - inode->i_nlink =0 ; -iput (inode); - *err = ret; -return NULL ; - } - *err =0 ;return inode; }
fs/udf/inode.c +0 -5
@@ -36,7 +36,6 @@#include <linux/pagemap.h> #include <linux/buffer_head.h> #include <linux/writeback.h> -#include <linux/quotaops.h> #include <linux/slab.h> #include <linux/crc-itu-t.h>
@@ -71,9 +70,6 @@ static int udf_get_block(struct inode *, sector_t, struct buffer_head *, int);void udf_delete_inode (struct inode *inode) { -if (!is_bad_inode (inode)) -dquot_initialize (inode); -truncate_inode_pages (&inode->i_data,0 );if (is_bad_inode (inode))
@@ -113,7 +109,6 @@ void udf_clear_inode(struct inode *inode) (unsigned long long)iinfo->i_lenExtents); } -dquot_drop (inode);kfree (iinfo->i_ext.i_data); iinfo->i_ext.i_data =NULL ; }
fs/udf/namei.c +0 -20
@@ -27,7 +27,6 @@#include <linux/errno.h> #include <linux/mm.h> #include <linux/slab.h> -#include <linux/quotaops.h> #include <linux/smp_lock.h> #include <linux/buffer_head.h> #include <linux/sched.h>
@@ -563,8 +562,6 @@ static int udf_create(struct inode *dir, struct dentry *dentry, int mode,int err;struct udf_inode_info *iinfo; -dquot_initialize (dir); -lock_kernel (); inode =udf_new_inode (dir, mode, &err);if (!inode) {
@@ -618,8 +615,6 @@ static int udf_mknod(struct inode *dir, struct dentry *dentry, int mode,if (!old_valid_dev (rdev))return -EINVAL ; -dquot_initialize (dir); -lock_kernel (); err = -EIO ; inode =udf_new_inode (dir, mode, &err);
@@ -666,8 +661,6 @@ static int udf_mkdir(struct inode *dir, struct dentry *dentry, int mode)struct udf_inode_info *dinfo =UDF_I (dir);struct udf_inode_info *iinfo; -dquot_initialize (dir); -lock_kernel (); err = -EMLINK ;if (dir->i_nlink >= (256 <<sizeof (dir->i_nlink)) -1 )
@@ -805,8 +798,6 @@ static int udf_rmdir(struct inode *dir, struct dentry *dentry)struct fileIdentDesc *fi, cfi;struct kernel_lb_addr tloc; -dquot_initialize (dir); - retval = -ENOENT ;lock_kernel (); fi =udf_find_entry (dir, &dentry->d_name, &fibh, &cfi);
@@ -853,8 +844,6 @@ static int udf_unlink(struct inode *dir, struct dentry *dentry)struct fileIdentDesc cfi;struct kernel_lb_addr tloc; -dquot_initialize (dir); - retval = -ENOENT ;lock_kernel (); fi =udf_find_entry (dir, &dentry->d_name, &fibh, &cfi);
@@ -909,8 +898,6 @@ static int udf_symlink(struct inode *dir, struct dentry *dentry,struct buffer_head *bh;struct udf_inode_info *iinfo; -dquot_initialize (dir); -lock_kernel (); inode =udf_new_inode (dir,S_IFLNK , &err);if (!inode)
@@ -1081,8 +1068,6 @@ static int udf_link(struct dentry *old_dentry, struct inode *dir,int err;struct buffer_head *bh; -dquot_initialize (dir); -lock_kernel ();if (inode->i_nlink >= (256 <<sizeof (inode->i_nlink)) -1 ) {unlock_kernel ();
@@ -1145,9 +1130,6 @@ static int udf_rename(struct inode *old_dir, struct dentry *old_dentry,struct kernel_lb_addr tloc;struct udf_inode_info *old_iinfo =UDF_I (old_inode); -dquot_initialize (old_dir); -dquot_initialize (new_dir); -lock_kernel (); ofi =udf_find_entry (old_dir, &old_dentry->d_name, &ofibh, &ocfi);if (ofi) {
@@ -1393,7 +1375,6 @@ const struct export_operations udf_export_ops = {const struct inode_operations udf_dir_inode_operations = { .lookup = udf_lookup, .create = udf_create, - .setattr = udf_setattr, .link = udf_link, .unlink = udf_unlink, .symlink = udf_symlink,
@@ -1406,5 +1387,4 @@ const struct inode_operations udf_symlink_inode_operations = { .readlink = generic_readlink, .follow_link = page_follow_link_light, .put_link = page_put_link, - .setattr = udf_setattr, };
fs/udf/super.c +2 -16
@@ -54,7 +54,6 @@#include <linux/vmalloc.h> #include <linux/errno.h> #include <linux/mount.h> -#include <linux/quotaops.h> #include <linux/seq_file.h> #include <linux/bitmap.h> #include <linux/crc-itu-t.h>
@@ -587,18 +586,11 @@ static int udf_remount_fs(struct super_block *sb, int *flags, char *options)if ((*flags &MS_RDONLY ) == (sb->s_flags &MS_RDONLY )) goto out_unlock; -if (*flags &MS_RDONLY ) { +if (*flags &MS_RDONLY )udf_close_lvid (sb); - - error =dquot_suspend (sb,-1 ); - }else { +else udf_open_lvid (sb); -/* mark the fs r/w for quota activity */ - sb->s_flags &= ~MS_RDONLY ; -dquot_resume (sb,-1 ); - } - out_unlock:unlock_kernel ();return error;
@@ -1948,10 +1940,6 @@ static int udf_fill_super(struct super_block *sb, void *options, int silent)/* Fill in the rest of the superblock */ sb->s_op = &udf_sb_ops; sb->s_export_op = &udf_export_ops; -#ifdef CONFIG_QUOTA - sb->s_qcop = &dquot_quotactl_ops; - sb->dq_op =NULL ;/* &dquot_operations */ -#endif sb->s_dirt =0 ; sb->s_magic =UDF_SUPER_MAGIC ;
@@ -2106,8 +2094,6 @@ static void udf_put_super(struct super_block *sb)int i;struct udf_sb_info *sbi; -dquot_disable (sb,-1 ,DQUOT_USAGE_ENABLED |DQUOT_LIMITS_ENABLED ); - sbi =UDF_SB (sb);lock_kernel ();
fs/udf/udfdecl.h +0 -1
@@ -132,7 +132,6 @@ extern int udf_write_fi(struct inode *inode, struct fileIdentDesc *,/* file.c */ extern int udf_ioctl (struct inode *,struct file *,unsigned int ,unsigned long ); -extern int udf_setattr (struct dentry *dentry,struct iattr *iattr);/* inode.c */ extern struct inode *udf_iget (struct super_block *,struct kernel_lb_addr *);extern int udf_sync_inode (struct inode *);
Signature · 1 line
1.6.4.2
Jan Kara
reviewerPATCH 2/2 ufs: Remove dead quota code
In reply to Jan KaraUFS quota is non-functional at least since 2.6.12 because dq_op was set to NULL. Since the filesystem exists mainly to allow cooperation with Solaris and quota format isn't standard, just remove the dead code.
--- fs/ufs/balloc.c | 24 ---------- fs/ufs/file.c | 3 +- fs/ufs/ialloc.c | 13 ----- fs/ufs/inode.c | 4 -- fs/ufs/namei.c | 16 ------- fs/ufs/super.c | 126 ----------------------------------------------------- fs/ufs/truncate.c | 10 ---- 7 files changed, 1 insertions(+), 195 deletions(-)
fs/ufs/balloc.c +0 -24
@@ -12,7 +12,6 @@#include <linux/stat.h> #include <linux/time.h> #include <linux/string.h> -#include <linux/quotaops.h> #include <linux/buffer_head.h> #include <linux/capability.h> #include <linux/bitops.h>
@@ -85,9 +84,6 @@ void ufs_free_fragments(struct inode *inode, u64 fragment, unsigned count) "bit already cleared for fragment %u", i); } -dquot_free_block (inode, count); - -fs32_add (sb, &ucg->cg_cs.cs_nffree, count); uspi->cs_total.cs_nffree += count;fs32_add (sb, &UFS_SB (sb)->fs_cs (cgno).cs_nffree, count);
@@ -195,7 +191,6 @@ do_more:ubh_setblock (UCPI_UBH (ucpi), ucpi->c_freeoff, blkno);if ((UFS_SB (sb)->s_flags &UFS_CG_MASK ) ==UFS_CG_44BSD )ufs_clusteracct (sb, ucpi, blkno,1 ); -dquot_free_block (inode, uspi->s_fpb);fs32_add (sb, &ucg->cg_cs.cs_nbfree,1 ); uspi->cs_total.cs_nbfree++;
@@ -511,7 +506,6 @@ static u64 ufs_add_fragments(struct inode *inode, u64 fragment,struct ufs_cg_private_info * ucpi;struct ufs_cylinder_group * ucg;unsigned cgno, fragno, fragoff, count, fragsize, i; -int ret;UFSD ("ENTER, fragment %llu, oldcount %u, newcount %u\n" , (unsigned long long )fragment, oldcount, newcount);
@@ -557,11 +551,6 @@ static u64 ufs_add_fragments(struct inode *inode, u64 fragment,fs32_add (sb, &ucg->cg_frsum[fragsize - count],1 );for (i = oldcount; i < newcount; i++)ubh_clrbit (UCPI_UBH (ucpi), ucpi->c_freeoff, fragno + i); - ret =dquot_alloc_block (inode, count); -if (ret) { - *err = ret; -return 0 ; - }fs32_sub (sb, &ucg->cg_cs.cs_nffree, count);fs32_sub (sb, &UFS_SB (sb)->fs_cs (cgno).cs_nffree, count);
@@ -598,7 +587,6 @@ static u64 ufs_alloc_fragments(struct inode *inode, unsigned cgno,struct ufs_cylinder_group * ucg;unsigned oldcg, i, j, k, allocsize;u64 result; -int ret;UFSD ("ENTER, ino %lu, cgno %u, goal %llu, count %u\n" , inode->i_ino, cgno, (unsigned long long )goal, count);
@@ -667,7 +655,6 @@ cg_found:for (i = count; i < uspi->s_fpb; i++)ubh_setbit (UCPI_UBH (ucpi), ucpi->c_freeoff, goal + i); i = uspi->s_fpb - count; -dquot_free_block (inode, i);fs32_add (sb, &ucg->cg_cs.cs_nffree, i); uspi->cs_total.cs_nffree += i;
@@ -679,11 +666,6 @@ cg_found: result =ufs_bitmap_search (sb, ucpi, goal, allocsize);if (result ==INVBLOCK )return 0 ; - ret =dquot_alloc_block (inode, count); -if (ret) { - *err = ret; -return 0 ; - }for (i =0 ; i < count; i++)ubh_clrbit (UCPI_UBH (ucpi), ucpi->c_freeoff, result + i);
@@ -718,7 +700,6 @@ static u64 ufs_alloccg_block(struct inode *inode,struct ufs_super_block_first * usb1;struct ufs_cylinder_group * ucg;u64 result, blkno; -int ret;UFSD ("ENTER, goal %llu\n" , (unsigned long long )goal);
@@ -752,11 +733,6 @@ gotit:ubh_clrblock (UCPI_UBH (ucpi), ucpi->c_freeoff, blkno);if ((UFS_SB (sb)->s_flags &UFS_CG_MASK ) ==UFS_CG_44BSD )ufs_clusteracct (sb, ucpi, blkno,-1 ); - ret =dquot_alloc_block (inode, uspi->s_fpb); -if (ret) { - *err = ret; -return INVBLOCK ; - }fs32_sub (sb, &ucg->cg_cs.cs_nbfree,1 ); uspi->cs_total.cs_nbfree--;
fs/ufs/file.c +1 -2
@@ -24,7 +24,6 @@*/ #include <linux/fs.h> -#include <linux/quotaops.h> #include "ufs_fs.h" #include "ufs.h"
@@ -41,7 +40,7 @@ const struct file_operations ufs_file_operations = { .write = do_sync_write, .aio_write = generic_file_aio_write, .mmap = generic_file_mmap, - .open = dquot_file_open, + .open = generic_file_open, .fsync = simple_fsync, .splice_read = generic_file_splice_read, };
fs/ufs/ialloc.c +0 -13
@@ -27,7 +27,6 @@#include <linux/time.h> #include <linux/stat.h> #include <linux/string.h> -#include <linux/quotaops.h> #include <linux/buffer_head.h> #include <linux/sched.h> #include <linux/bitops.h>
@@ -95,9 +94,6 @@ void ufs_free_inode (struct inode * inode) is_directory =S_ISDIR (inode->i_mode); -dquot_free_inode (inode); -dquot_drop (inode); -clear_inode (inode);if (ubh_isclr (UCPI_UBH (ucpi), ucpi->c_iusedoff, bit))
@@ -355,21 +351,12 @@ cg_found:unlock_super (sb); -dquot_initialize (inode); - err =dquot_alloc_inode (inode); -if (err) { -dquot_drop (inode); - goto fail_without_unlock; - } -UFSD ("allocating inode %lu\n" , inode->i_ino);UFSD ("EXIT\n" );return inode; fail_remove_inode:unlock_super (sb); -fail_without_unlock: - inode->i_flags |=S_NOQUOTA ; inode->i_nlink =0 ;iput (inode);UFSD ("EXIT (FAILED): err %d\n" , err);
fs/ufs/inode.c +0 -4
@@ -37,7 +37,6 @@#include <linux/smp_lock.h> #include <linux/buffer_head.h> #include <linux/writeback.h> -#include <linux/quotaops.h> #include "ufs_fs.h" #include "ufs.h"
@@ -910,9 +909,6 @@ void ufs_delete_inode (struct inode * inode) {loff_t old_i_size; -if (!is_bad_inode (inode)) -dquot_initialize (inode); -truncate_inode_pages (&inode->i_data,0 );if (is_bad_inode (inode)) goto no_delete;
fs/ufs/namei.c +0 -16
@@ -30,7 +30,6 @@#include <linux/time.h> #include <linux/fs.h> #include <linux/smp_lock.h> -#include <linux/quotaops.h> #include "ufs_fs.h" #include "ufs.h"
@@ -86,8 +85,6 @@ static int ufs_create (struct inode * dir, struct dentry * dentry, int mode,UFSD ("BEGIN\n" ); -dquot_initialize (dir); - inode =ufs_new_inode (dir, mode); err =PTR_ERR (inode);
@@ -112,8 +109,6 @@ static int ufs_mknod (struct inode * dir, struct dentry *dentry, int mode, dev_tif (!old_valid_dev (rdev))return -EINVAL ; -dquot_initialize (dir); - inode =ufs_new_inode (dir, mode); err =PTR_ERR (inode);if (!IS_ERR (inode)) {
@@ -138,8 +133,6 @@ static int ufs_symlink (struct inode * dir, struct dentry * dentry,if (l > sb->s_blocksize) goto out_notlocked; -dquot_initialize (dir); -lock_kernel (); inode =ufs_new_inode (dir,S_IFLNK |S_IRWXUGO ); err =PTR_ERR (inode);
@@ -185,8 +178,6 @@ static int ufs_link (struct dentry * old_dentry, struct inode * dir,return -EMLINK ; } -dquot_initialize (dir); - inode->i_ctime =CURRENT_TIME_SEC ;inode_inc_link_count (inode);atomic_inc (&inode->i_count);
@@ -204,8 +195,6 @@ static int ufs_mkdir(struct inode * dir, struct dentry * dentry, int mode)if (dir->i_nlink >=UFS_LINK_MAX ) goto out; -dquot_initialize (dir); -lock_kernel ();inode_inc_link_count (dir);
@@ -250,8 +239,6 @@ static int ufs_unlink(struct inode *dir, struct dentry *dentry)struct page *page;int err = -ENOENT ; -dquot_initialize (dir); - de =ufs_find_entry (dir, &dentry->d_name, &page);if (!de) goto out;
@@ -296,9 +283,6 @@ static int ufs_rename(struct inode *old_dir, struct dentry *old_dentry,struct ufs_dir_entry *old_de;int err = -ENOENT ; -dquot_initialize (old_dir); -dquot_initialize (new_dir); - old_de =ufs_find_entry (old_dir, &old_dentry->d_name, &old_page);if (!old_de) goto out;
fs/ufs/super.c +0 -126
187 lines not on this page · raw message
fs/ufs/truncate.c +0 -10
@@ -44,7 +44,6 @@#include <linux/buffer_head.h> #include <linux/blkdev.h> #include <linux/sched.h> -#include <linux/quotaops.h> #include "ufs_fs.h" #include "ufs.h"
@@ -518,15 +517,6 @@ int ufs_setattr(struct dentry *dentry, struct iattr *attr)if (error)return error; -if (is_quota_modification (inode, attr)) -dquot_initialize (inode); - -if ((ia_valid &ATTR_UID && attr->ia_uid != inode->i_uid) || - (ia_valid &ATTR_GID && attr->ia_gid != inode->i_gid)) { - error =dquot_transfer (inode, attr); -if (error) -return error; - }if (ia_valid &ATTR_SIZE && attr->ia_size != inode->i_size) {loff_t old_i_size = inode->i_size;
Signature · 1 line
1.6.4.2
PATCH 1/1 pohmelfs: Remove dead quota code
In reply to Jan KaraQuoted 5 lines · Jan Kara
Two patches below remove dead quota code from UFS and UDF. Quota is
non-functional (quotaon fails) for these filesystems for several years and noone complained AFAIK. Also the main purpose of these filesystems is interoperability with other systems and quota support is linux-specific so it does not make too much sense. So remove the dead code...
Awesome. Let's remove dead quota code completely.
Quoted 1 line
From
e6095c822e076b426b6684901f9c7a824cdab0d9Mon Sep 17 00:00:00 2001
From: root <root@dws1.(none)>
Date: Fri, 21 May 2010 11:16:10 +0400
Subject: [PATCH] pohmelfs: Remove dead quota code
Quota on pohmelfs is non-functional. IFAIU quota logic was copy-pasted from generic setattr().
--- drivers/staging/pohmelfs/inode.c | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-)
drivers/staging/pohmelfs/inode.c +0 -8
@@ -29,7 +29,6 @@#include <linux/slab.h> #include <linux/statfs.h> #include <linux/writeback.h> -#include <linux/quotaops.h> #include "netfs.h"
@@ -967,13 +966,6 @@ int pohmelfs_setattr_raw(struct inode *inode, struct iattr *attr) goto err_out_exit; } -if ((attr->ia_valid &ATTR_UID && attr->ia_uid != inode->i_uid) || - (attr->ia_valid &ATTR_GID && attr->ia_gid != inode->i_gid)) { - err =dquot_transfer (inode, attr); -if (err) - goto err_out_exit; - } - err =inode_setattr (inode, attr);if (err) {dprintk ("%s: ino: %llu, failed to set the attributes.\n" , __func__,POHMELFS_I (inode)->ino);
Signature · 1 line
1.6.2.5
Re: [PATCH] pohmelfs: Remove dead quota code
Hi.
Quoted 7 lines · Dmitry Monakhov
Quoted 5 lines
Two patches below remove dead quota code from UFS and UDF. Quota is
non-functional (quotaon fails) for these filesystems for several years and noone complained AFAIK. Also the main purpose of these filesystems is interoperability with other systems and quota support is linux-specific so it does not make too much sense. So remove the dead code...Awesome. Let's remove dead quota code completely.
Quoted 8 lines
Quoted 1 line
From
e6095c822e076b426b6684901f9c7a824cdab0d9Mon Sep 17 00:00:00 2001From: root <root@dws1.(none)>
Date: Fri, 21 May 2010 11:16:10 +0400
Subject: [PATCH] pohmelfs: Remove dead quota code
X-Spam-Status: No, hits=0.000000 required=0.900000Quota on pohmelfs is non-functional. IFAIU quota logic was copy-pasted from generic
setattr().
Tsss, do not tell anyone :)
Quoted 1 line
Signed-off-by Dmitry Monakhov <[email protected]>
Ack.
Signature · 1 line
Evgeniy Polyakov
Jan Kara
reviewerRe: [PATCH] pohmelfs: Remove dead quota code
In reply to Dmitry MonakhovQuoted 8 lines · Dmitry Monakhov
Quoted 5 lines · Jan Kara
Two patches below remove dead quota code from UFS and UDF. Quota is
non-functional (quotaon fails) for these filesystems for several years and noone complained AFAIK. Also the main purpose of these filesystems is interoperability with other systems and quota support is linux-specific so it does not make too much sense. So remove the dead code...Awesome. Let's remove dead quota code completely.
Thanks. Applied.
Honza
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR