Merge branch 'iommu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/joro...

[~andy/linux] / fs / jfs / file.c

diff --git a/fs/jfs/file.c b/fs/jfs/file.c
index a4229e49330ea9570685cf7721f6b39f689f19e2..14ba982b3f24f96c60f45472749816d17eea0194 100644 (file)
--- a/fs/jfs/file.c
+++ b/fs/jfs/file.c
@@ -48,7 +48,7 @@ static int jfs_open(struct inode *inode, struct file *file)
 {
        int rc;
 
-       if ((rc = generic_file_open(inode, file)))
+       if ((rc = dquot_file_open(inode, file)))
                return rc;
 
        /*
@@ -98,10 +98,13 @@ int jfs_setattr(struct dentry *dentry, struct iattr *iattr)
        if (rc)
                return rc;
 
+       if (iattr->ia_valid & ATTR_SIZE)
+               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)) {
-               if (vfs_dq_transfer(inode, iattr))
-                       return -EDQUOT;
+               rc = dquot_transfer(inode, iattr);
+               if (rc)
+                       return rc;
        }
 
        rc = inode_setattr(inode, iattr);