by Junxiao Bi

[permalink] [raw]

Subject: Re: [Ocfs2-devel] [PATCH 4/6] ocfs2: Handle error from dquot_initialize()

On 07/15/2015 08:42 PM, Jan Kara wrote:
> dquot_initialize() can now return error. Handle it where possible.
>
> Signed-off-by: Jan Kara <[email protected]>

Looks good.

Reviewed-by: Junxiao Bi <[email protected]>

> ---
> fs/ocfs2/file.c | 14 ++++++++----
> fs/ocfs2/namei.c | 59 +++++++++++++++++++++++++++++++++++++------------
> fs/ocfs2/refcounttree.c | 5 +++--
> 3 files changed, 58 insertions(+), 20 deletions(-)
>
> diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
> index 4d9e8275ed99..7210583b472f 100644
> --- a/fs/ocfs2/file.c
> +++ b/fs/ocfs2/file.c
> @@ -105,8 +105,11 @@ static int ocfs2_file_open(struct inode *inode, struct file *file)
> file->f_path.dentry->d_name.len,
> file->f_path.dentry->d_name.name, mode);
>
> - if (file->f_mode & FMODE_WRITE)
> - dquot_initialize(inode);
> + if (file->f_mode & FMODE_WRITE) {
> + status = dquot_initialize(inode);
> + if (status)
> + goto leave;
> + }
>
> spin_lock(&oi->ip_lock);
>
> @@ -1155,8 +1158,11 @@ int ocfs2_setattr(struct dentry *dentry, struct iattr *attr)
> if (status)
> return status;
>
> - if (is_quota_modification(inode, attr))
> - dquot_initialize(inode);
> + if (is_quota_modification(inode, attr)) {
> + status = dquot_initialize(inode);
> + if (status)
> + return status;
> + }
> size_change = S_ISREG(inode->i_mode) && attr->ia_valid & ATTR_SIZE;
> if (size_change) {
> status = ocfs2_rw_lock(inode, 1);
> diff --git a/fs/ocfs2/namei.c b/fs/ocfs2/namei.c
> index 6e6abb93fda5..948681e37cfd 100644
> --- a/fs/ocfs2/namei.c
> +++ b/fs/ocfs2/namei.c
> @@ -200,11 +200,12 @@ bail:
> static struct inode *ocfs2_get_init_inode(struct inode *dir, umode_t mode)
> {
> struct inode *inode;
> + int status;
>
> inode = new_inode(dir->i_sb);
> if (!inode) {
> mlog(ML_ERROR, "new_inode failed!\n");
> - return NULL;
> + return ERR_PTR(-ENOMEM);
> }
>
> /* populate as many fields early on as possible - many of
> @@ -213,7 +214,10 @@ static struct inode *ocfs2_get_init_inode(struct inode *dir, umode_t mode)
> if (S_ISDIR(mode))
> set_nlink(inode, 2);
> inode_init_owner(inode, dir, mode);
> - dquot_initialize(inode);
> + status = dquot_initialize(inode);
> + if (status)
> + return ERR_PTR(status);
> +
> return inode;
> }
>
> @@ -264,7 +268,11 @@ static int ocfs2_mknod(struct inode *dir,
> (unsigned long long)OCFS2_I(dir)->ip_blkno,
> (unsigned long)dev, mode);
>
> - dquot_initialize(dir);
> + status = dquot_initialize(dir);
> + if (status) {
> + mlog_errno(status);
> + return status;
> + }
>
> /* get our super block */
> osb = OCFS2_SB(dir->i_sb);
> @@ -311,8 +319,9 @@ static int ocfs2_mknod(struct inode *dir,
> }
>
> inode = ocfs2_get_init_inode(dir, mode);
> - if (!inode) {
> - status = -ENOMEM;
> + if (IS_ERR(inode)) {
> + status = PTR_ERR(inode);
> + inode = NULL;
> mlog_errno(status);
> goto leave;
> }
> @@ -708,7 +717,11 @@ static int ocfs2_link(struct dentry *old_dentry,
> if (S_ISDIR(inode->i_mode))
> return -EPERM;
>
> - dquot_initialize(dir);
> + err = dquot_initialize(dir);
> + if (err) {
> + mlog_errno(err);
> + return err;
> + }
>
> err = ocfs2_double_lock(osb, &old_dir_bh, old_dir,
> &parent_fe_bh, dir, 0);
> @@ -896,7 +909,11 @@ static int ocfs2_unlink(struct inode *dir,
> (unsigned long long)OCFS2_I(dir)->ip_blkno,
> (unsigned long long)OCFS2_I(inode)->ip_blkno);
>
> - dquot_initialize(dir);
> + status = dquot_initialize(dir);
> + if (status) {
> + mlog_errno(status);
> + return status;
> + }
>
> BUG_ON(d_inode(dentry->d_parent) != dir);
>
> @@ -1230,8 +1247,16 @@ static int ocfs2_rename(struct inode *old_dir,
> old_dentry->d_name.len, old_dentry->d_name.name,
> new_dentry->d_name.len, new_dentry->d_name.name);
>
> - dquot_initialize(old_dir);
> - dquot_initialize(new_dir);
> + status = dquot_initialize(old_dir);
> + if (status) {
> + mlog_errno(status);
> + goto bail;
> + }
> + status = dquot_initialize(new_dir);
> + if (status) {
> + mlog_errno(status);
> + goto bail;
> + }
>
> osb = OCFS2_SB(old_dir->i_sb);
>
> @@ -1786,7 +1811,11 @@ static int ocfs2_symlink(struct inode *dir,
> trace_ocfs2_symlink_begin(dir, dentry, symname,
> dentry->d_name.len, dentry->d_name.name);
>
> - dquot_initialize(dir);
> + status = dquot_initialize(dir);
> + if (status) {
> + mlog_errno(status);
> + goto bail;
> + }
>
> sb = dir->i_sb;
> osb = OCFS2_SB(sb);
> @@ -1831,8 +1860,9 @@ static int ocfs2_symlink(struct inode *dir,
> }
>
> inode = ocfs2_get_init_inode(dir, S_IFLNK | S_IRWXUGO);
> - if (!inode) {
> - status = -ENOMEM;
> + if (IS_ERR(inode)) {
> + status = PTR_ERR(inode);
> + inode = NULL;
> mlog_errno(status);
> goto bail;
> }
> @@ -2485,8 +2515,9 @@ int ocfs2_create_inode_in_orphan(struct inode *dir,
> }
>
> inode = ocfs2_get_init_inode(dir, mode);
> - if (!inode) {
> - status = -ENOMEM;
> + if (IS_ERR(inode)) {
> + status = PTR_ERR(inode);
> + inode = NULL;
> mlog_errno(status);
> goto leave;
> }
> diff --git a/fs/ocfs2/refcounttree.c b/fs/ocfs2/refcounttree.c
> index b69dd14c0b9b..7dc818b87cd8 100644
> --- a/fs/ocfs2/refcounttree.c
> +++ b/fs/ocfs2/refcounttree.c
> @@ -4419,8 +4419,9 @@ static int ocfs2_vfs_reflink(struct dentry *old_dentry, struct inode *dir,
> }
>
> mutex_lock(&inode->i_mutex);
> - dquot_initialize(dir);
> - error = ocfs2_reflink(old_dentry, dir, new_dentry, preserve);
> + error = dquot_initialize(dir);
> + if (!error)
> + error = ocfs2_reflink(old_dentry, dir, new_dentry, preserve);
> mutex_unlock(&inode->i_mutex);
> if (!error)
> fsnotify_create(dir, new_dentry);
>

2015-07-16 10:02:24

by Jan Kara

[permalink] [raw]

Subject: Re: [PATCH] dquot_initialize() can now return error. Handle it where possible

On Wed 15-07-15 13:53:19, Dave Kleikamp wrote:
> Slightly modified by Dave Kleikamp due to needed jfs_rename() error path fix.
>
> Signed-off-by: Jan Kara <[email protected]>
> Reviewed-by: Dave Kleikamp <[email protected]>

Thanks! I have picked up both patches for now so that I have the series
consistent. I will wait for a few days before pushing my series to
linux-next so that your patch has time to reach Linus and I don't
create unnecessary conflicts...

Honza

> ---
> fs/jfs/file.c | 7 +++++--
> fs/jfs/jfs_inode.c | 4 +++-
> fs/jfs/namei.c | 54 ++++++++++++++++++++++++++++++++++++++++--------------
> 3 files changed, 48 insertions(+), 17 deletions(-)
>
> diff --git a/fs/jfs/file.c b/fs/jfs/file.c
> index e98d39d..34ad63ea0 100644
> --- a/fs/jfs/file.c
> +++ b/fs/jfs/file.c
> @@ -107,8 +107,11 @@ int jfs_setattr(struct dentry *dentry, struct iattr *iattr)
> if (rc)
> return rc;
>
> - if (is_quota_modification(inode, iattr))
> - dquot_initialize(inode);
> + if (is_quota_modification(inode, iattr)) {
> + rc = dquot_initialize(inode);
> + if (rc)
> + return rc;
> + }
> if ((iattr->ia_valid & ATTR_UID && !uid_eq(iattr->ia_uid, inode->i_uid)) ||
> (iattr->ia_valid & ATTR_GID && !gid_eq(iattr->ia_gid, inode->i_gid))) {
> rc = dquot_transfer(inode, iattr);
> diff --git a/fs/jfs/jfs_inode.c b/fs/jfs/jfs_inode.c
> index 6b0f816..cf7936f 100644
> --- a/fs/jfs/jfs_inode.c
> +++ b/fs/jfs/jfs_inode.c
> @@ -109,7 +109,9 @@ struct inode *ialloc(struct inode *parent, umode_t mode)
> /*
> * Allocate inode to quota.
> */
> - dquot_initialize(inode);
> + rc = dquot_initialize(inode);
> + if (rc)
> + goto fail_drop;
> rc = dquot_alloc_inode(inode);
> if (rc)
> goto fail_drop;
> diff --git a/fs/jfs/namei.c b/fs/jfs/namei.c
> index a5ac97b..35976bd 100644
> --- a/fs/jfs/namei.c
> +++ b/fs/jfs/namei.c
> @@ -86,7 +86,9 @@ static int jfs_create(struct inode *dip, struct dentry *dentry, umode_t mode,
>
> jfs_info("jfs_create: dip:0x%p name:%pd", dip, dentry);
>
> - dquot_initialize(dip);
> + rc = dquot_initialize(dip);
> + if (rc)
> + goto out1;
>
> /*
> * search parent directory for entry/freespace
> @@ -218,7 +220,9 @@ static int jfs_mkdir(struct inode *dip, struct dentry *dentry, umode_t mode)
>
> jfs_info("jfs_mkdir: dip:0x%p name:%pd", dip, dentry);
>
> - dquot_initialize(dip);
> + rc = dquot_initialize(dip);
> + if (rc)
> + goto out1;
>
> /*
> * search parent directory for entry/freespace
> @@ -355,8 +359,12 @@ static int jfs_rmdir(struct inode *dip, struct dentry *dentry)
> jfs_info("jfs_rmdir: dip:0x%p name:%pd", dip, dentry);
>
> /* Init inode for quota operations. */
> - dquot_initialize(dip);
> - dquot_initialize(ip);
> + rc = dquot_initialize(dip);
> + if (rc)
> + goto out;
> + rc = dquot_initialize(ip);
> + if (rc)
> + goto out;
>
> /* directory must be empty to be removed */
> if (!dtEmpty(ip)) {
> @@ -483,8 +491,12 @@ static int jfs_unlink(struct inode *dip, struct dentry *dentry)
> jfs_info("jfs_unlink: dip:0x%p name:%pd", dip, dentry);
>
> /* Init inode for quota operations. */
> - dquot_initialize(dip);
> - dquot_initialize(ip);
> + rc = dquot_initialize(dip);
> + if (rc)
> + goto out;
> + rc = dquot_initialize(ip);
> + if (rc)
> + goto out;
>
> if ((rc = get_UCSname(&dname, dentry)))
> goto out;
> @@ -799,7 +811,9 @@ static int jfs_link(struct dentry *old_dentry,
>
> jfs_info("jfs_link: %pd %pd", old_dentry, dentry);
>
> - dquot_initialize(dir);
> + rc = dquot_initialize(dir);
> + if (rc)
> + goto out;
>
> tid = txBegin(ip->i_sb, 0);
>
> @@ -810,7 +824,7 @@ static int jfs_link(struct dentry *old_dentry,
> * scan parent directory for entry/freespace
> */
> if ((rc = get_UCSname(&dname, dentry)))
> - goto out;
> + goto out_tx;
>
> if ((rc = dtSearch(dir, &dname, &ino, &btstack, JFS_CREATE)))
> goto free_dname;
> @@ -842,12 +856,13 @@ static int jfs_link(struct dentry *old_dentry,
> free_dname:
> free_UCSname(&dname);
>
> - out:
> + out_tx:
> txEnd(tid);
>
> mutex_unlock(&JFS_IP(ip)->commit_mutex);
> mutex_unlock(&JFS_IP(dir)->commit_mutex);
>
> + out:
> jfs_info("jfs_link: rc:%d", rc);
> return rc;
> }
> @@ -891,7 +906,9 @@ static int jfs_symlink(struct inode *dip, struct dentry *dentry,
>
> jfs_info("jfs_symlink: dip:0x%p name:%s", dip, name);
>
> - dquot_initialize(dip);
> + rc = dquot_initialize(dip);
> + if (rc)
> + goto out1;
>
> ssize = strlen(name) + 1;
>
> @@ -1082,8 +1099,12 @@ static int jfs_rename(struct inode *old_dir, struct dentry *old_dentry,
>
> jfs_info("jfs_rename: %pd %pd", old_dentry, new_dentry);
>
> - dquot_initialize(old_dir);
> - dquot_initialize(new_dir);
> + rc = dquot_initialize(old_dir);
> + if (rc)
> + goto out1;
> + rc = dquot_initialize(new_dir);
> + if (rc)
> + goto out1;
>
> old_ip = d_inode(old_dentry);
> new_ip = d_inode(new_dentry);
> @@ -1130,7 +1151,9 @@ static int jfs_rename(struct inode *old_dir, struct dentry *old_dentry,
> } else if (new_ip) {
> IWRITE_LOCK(new_ip, RDWRLOCK_NORMAL);
> /* Init inode for quota operations. */
> - dquot_initialize(new_ip);
> + rc = dquot_initialize(new_ip);
> + if (rc)
> + goto out_unlock;
> }
>
> /*
> @@ -1318,6 +1341,7 @@ static int jfs_rename(struct inode *old_dir, struct dentry *old_dentry,
>
> clear_cflag(COMMIT_Stale, old_dir);
> }
> + out_unlock:
> if (new_ip && !S_ISDIR(new_ip->i_mode))
> IWRITE_UNLOCK(new_ip);
> out3:
> @@ -1353,7 +1377,9 @@ static int jfs_mknod(struct inode *dir, struct dentry *dentry,
>
> jfs_info("jfs_mknod: %pd", dentry);
>
> - dquot_initialize(dir);
> + rc = dquot_initialize(dir);
> + if (rc)
> + goto out;
>
> if ((rc = get_UCSname(&dname, dentry)))
> goto out;
> --
> 2.4.5
>
>
--
Jan Kara <[email protected]>
SUSE Labs, CR