diff mbox

ubifs: make ubifs_[get|set]xattr atomic

Message ID 1438234650-21289-1-git-send-email-yangds.fnst@cn.fujitsu.com
State Changes Requested
Headers show

Commit Message

Dongsheng Yang July 30, 2015, 5:37 a.m. UTC 
This commit make the ubifs_[get|set]xattr protected by ui_mutex,
making xfstests/generic/037 passed.

Signed-off-by: Dongsheng Yang <yangds.fnst@cn.fujitsu.com>
---
 fs/ubifs/xattr.c | 4 ++++
 1 file changed, 4 insertions(+)

Comments

Richard Weinberger July 30, 2015, 8:05 a.m. UTC | #1 
Am 30.07.2015 um 07:37 schrieb Dongsheng Yang:
> This commit make the ubifs_[get|set]xattr protected by ui_mutex,
> making xfstests/generic/037 passed.

Making a test pass is not a good patch description.
Please describe what needs protection and why. :-)

Thanks,
//richard
Dongsheng Yang July 31, 2015, 12:04 a.m. UTC | #2 
On 07/30/2015 04:05 PM, Richard Weinberger wrote:
> Am 30.07.2015 um 07:37 schrieb Dongsheng Yang:
>> This commit make the ubifs_[get|set]xattr protected by ui_mutex,
>> making xfstests/generic/037 passed.
>
> Making a test pass is not a good patch description.
> Please describe what needs protection and why. :-)

Agreed, sorry for my lazy :)

Will send a V2 with more description.

Thanx
Yang
>
> Thanks,
> //richard
>
diff mbox

Patch

diff --git a/fs/ubifs/xattr.c b/fs/ubifs/xattr.c
index 96f3448..dec1afd 100644
--- a/fs/ubifs/xattr.c
+++ b/fs/ubifs/xattr.c
@@ -208,6 +208,7 @@  static int change_xattr(struct ubifs_info *c, struct inode *host,
 	if (err)
 		return err;
 
+	mutex_lock(&ui->ui_mutex);
 	kfree(ui->data);
 	ui->data = kmemdup(value, size, GFP_NOFS);
 	if (!ui->data) {
@@ -216,6 +217,7 @@  static int change_xattr(struct ubifs_info *c, struct inode *host,
 	}
 	inode->i_size = ui->ui_size = size;
 	ui->data_len = size;
+	mutex_unlock(&ui->ui_mutex);
 
 	mutex_lock(&host_ui->ui_mutex);
 	host->i_ctime = ubifs_current_time(host);
@@ -409,6 +411,7 @@  ssize_t ubifs_getxattr(struct dentry *dentry, const char *name, void *buf,
 	ubifs_assert(inode->i_size == ui->data_len);
 	ubifs_assert(ubifs_inode(host)->xattr_size > ui->data_len);
 
+	mutex_lock(&ui->ui_mutex);
 	if (buf) {
 		/* If @buf is %NULL we are supposed to return the length */
 		if (ui->data_len > size) {
@@ -423,6 +426,7 @@  ssize_t ubifs_getxattr(struct dentry *dentry, const char *name, void *buf,
 	err = ui->data_len;
 
 out_iput:
+	mutex_unlock(&ui->ui_mutex);
 	iput(inode);
 out_unlock:
 	kfree(xent);