summaryrefslogtreecommitdiffstats
path: root/fs/jfs/file.c
diff options
context:
space:
mode:
authorDave Kleikamp <dave.kleikamp@oracle.com>2015-07-15 14:53:19 -0400
committerJan Kara <jack@suse.com>2015-07-23 14:59:39 -0400
commitacc84b05b1f463952a638689335ca47e70d5ea30 (patch)
tree477ad20902b4f9d3595950002d429808c1387c30 /fs/jfs/file.c
parent2e6c97ea4ce6a29941da46d03183c2c0e330fb2f (diff)
jfs: Handle error from dquot_initialize()
dquot_initialize() can now return error. Handle it where possible Slightly modified by Dave Kleikamp due to needed jfs_rename() error path fix. Signed-off-by: Jan Kara <jack@suse.com> Reviewed-by: Dave Kleikamp <dave.kleikamp@oracle.com>
Diffstat (limited to 'fs/jfs/file.c')
-rw-r--r--fs/jfs/file.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/fs/jfs/file.c b/fs/jfs/file.c
index b9dc23cd04f2..0e026a7bdcd4 100644
--- a/fs/jfs/file.c
+++ b/fs/jfs/file.c
@@ -107,8 +107,11 @@ int jfs_setattr(struct dentry *dentry, struct iattr *iattr)
107 if (rc) 107 if (rc)
108 return rc; 108 return rc;
109 109
110 if (is_quota_modification(inode, iattr)) 110 if (is_quota_modification(inode, iattr)) {
111 dquot_initialize(inode); 111 rc = dquot_initialize(inode);
112 if (rc)
113 return rc;
114 }
112 if ((iattr->ia_valid & ATTR_UID && !uid_eq(iattr->ia_uid, inode->i_uid)) || 115 if ((iattr->ia_valid & ATTR_UID && !uid_eq(iattr->ia_uid, inode->i_uid)) ||
113 (iattr->ia_valid & ATTR_GID && !gid_eq(iattr->ia_gid, inode->i_gid))) { 116 (iattr->ia_valid & ATTR_GID && !gid_eq(iattr->ia_gid, inode->i_gid))) {
114 rc = dquot_transfer(inode, iattr); 117 rc = dquot_transfer(inode, iattr);