diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-25 11:30:36 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-25 11:30:36 +1000 |
| commit | 55b756205c028ed85babe45b7943b37814f7b2f9 (patch) | |
| tree | a7eba746fa96b77bb14d3e2bce9729bc78a0584e /drivers | |
| parent | 89c061c1ba9bc01263f556da38f10145ee6b50c6 (diff) | |
| parent | fa3f71d5c733ac6a76416741eac0486c5f15ca71 (diff) | |
Merge remote branch 'ext3/for_next'
Conflicts:
fs/super.c
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/pohmelfs/inode.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/staging/pohmelfs/inode.c b/drivers/staging/pohmelfs/inode.c index 9286e863b0e7..e1ccb49c75ec 100644 --- a/drivers/staging/pohmelfs/inode.c +++ b/drivers/staging/pohmelfs/inode.c @@ -29,7 +29,6 @@ #include <linux/slab.h> #include <linux/statfs.h> #include <linux/writeback.h> -#include <linux/quotaops.h> #include "netfs.h" @@ -969,13 +968,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); |