Ocfs2 devel - Dec 2008 - [PATCH] ocfs2/xattr: Always updating ctime in xattr set.

In xattr set, we should always update ctime if the operation goes
sucessfully. The old one mistakenly put it in ocfs2_xattr_set_entry
which is only called when we set xattr in inode or xattr block. The
side benefit is that it resolve the bug 1052 since in that scenario,
ocfs2_calc_xattr_set_need only calc out the xattr set credits while
ocfs2_xattr_set_entry update the inode also which isn't concerned with
the process of xattr set.

Signed-off-by: Tao Ma <tao.ma at oracle.com>
---
 fs/ocfs2/xattr.c |   20 ++++++++++++++++----
 1 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/fs/ocfs2/xattr.c b/fs/ocfs2/xattr.c
index 7e0d62a..fa24067 100644
--- a/fs/ocfs2/xattr.c
+++ b/fs/ocfs2/xattr.c
@@ -1621,10 +1621,6 @@ static int ocfs2_xattr_set_entry(struct inode *inode,
 	oi->ip_dyn_features |= flag;
 	di->i_dyn_features = cpu_to_le16(oi->ip_dyn_features);
 	spin_unlock(&oi->ip_lock);
-	/* Update inode ctime */
-	inode->i_ctime = CURRENT_TIME;
-	di->i_ctime = cpu_to_le64(inode->i_ctime.tv_sec);
-	di->i_ctime_nsec = cpu_to_le32(inode->i_ctime.tv_nsec);
 
 	ret = ocfs2_journal_dirty(handle, xs->inode_bh);
 	if (ret < 0)
@@ -2528,6 +2524,20 @@ static int __ocfs2_xattr_set_handle(struct inode *inode,
 		}
 	}
 
+	if (!ret) {
+		/* Update inode ctime. */
+		ret = ocfs2_journal_access(ctxt->handle, inode, xis->inode_bh,
+					   OCFS2_JOURNAL_ACCESS_WRITE);
+		if (ret) {
+			mlog_errno(ret);
+			goto out;
+		}
+
+		inode->i_ctime = CURRENT_TIME;
+		di->i_ctime = cpu_to_le64(inode->i_ctime.tv_sec);
+		di->i_ctime_nsec = cpu_to_le32(inode->i_ctime.tv_nsec);
+		ocfs2_journal_dirty(ctxt->handle, xis->inode_bh);
+	}
 out:
 	return ret;
 }
@@ -2704,6 +2714,8 @@ int ocfs2_xattr_set(struct inode *inode,
 		goto cleanup;
 	}
 
+	/* we need to update inode's ctime field, so add credit for it. */
+	credits += OCFS2_INODE_UPDATE_CREDITS;
 	ctxt.handle = ocfs2_start_trans(osb, credits);
 	if (IS_ERR(ctxt.handle)) {
 		ret = PTR_ERR(ctxt.handle);
-- 
1.5.4.GIT

On Wed, Dec 03, 2008 at 02:40:32PM +0800, Tao Ma wrote:
> In xattr set, we should always update ctime if the operation goes
> sucessfully. The old one mistakenly put it in ocfs2_xattr_set_entry
> which is only called when we set xattr in inode or xattr block. The
> side benefit is that it resolve the bug 1052 since in that scenario,
> ocfs2_calc_xattr_set_need only calc out the xattr set credits while
> ocfs2_xattr_set_entry update the inode also which isn't concerned with
> the process of xattr set.
> 
> Signed-off-by: Tao Ma <tao.ma at oracle.com>
> ---
>  fs/ocfs2/xattr.c |   20 ++++++++++++++++----
>  1 files changed, 16 insertions(+), 4 deletions(-)
> 
> diff --git a/fs/ocfs2/xattr.c b/fs/ocfs2/xattr.c
> index 7e0d62a..fa24067 100644
> --- a/fs/ocfs2/xattr.c
> +++ b/fs/ocfs2/xattr.c
> @@ -1621,10 +1621,6 @@ static int ocfs2_xattr_set_entry(struct inode
*inode,
>  	oi->ip_dyn_features |= flag;
>  	di->i_dyn_features = cpu_to_le16(oi->ip_dyn_features);
>  	spin_unlock(&oi->ip_lock);
> -	/* Update inode ctime */
> -	inode->i_ctime = CURRENT_TIME;
> -	di->i_ctime = cpu_to_le64(inode->i_ctime.tv_sec);
> -	di->i_ctime_nsec = cpu_to_le32(inode->i_ctime.tv_nsec);
>  
>  	ret = ocfs2_journal_dirty(handle, xs->inode_bh);
>  	if (ret < 0)
> @@ -2528,6 +2524,20 @@ static int __ocfs2_xattr_set_handle(struct inode
*inode,
>  		}
>  	}
>  
> +	if (!ret) {
> +		/* Update inode ctime. */
> +		ret = ocfs2_journal_access(ctxt->handle, inode, xis->inode_bh,
> +					   OCFS2_JOURNAL_ACCESS_WRITE);
> +		if (ret) {
> +			mlog_errno(ret);
> +			goto out;
> +		}
> +
> +		inode->i_ctime = CURRENT_TIME;
> +		di->i_ctime = cpu_to_le64(inode->i_ctime.tv_sec);
> +		di->i_ctime_nsec = cpu_to_le32(inode->i_ctime.tv_nsec);
> +		ocfs2_journal_dirty(ctxt->handle, xis->inode_bh);
> +	}
>  out:
>  	return ret;
>  }
	As I stated on the bug, I think you should be doing the
journal_access up at the top of __ocfs2_xattr_set_handle() before you
modify the xattr buffers.  But otherwise, this looks good.

Joel

-- 

To spot the expert, pick the one who predicts the job will take the
longest and cost the most.

Joel Becker
Principal Software Developer
Oracle
E-mail: joel.becker at oracle.com
Phone: (650) 506-8127