Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
linux/3.2: add symlink xattr support to ubifs
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30794 3c298f89-4303-0410-b956-a3cf2f4a3e73
- Loading branch information
juhosg
committed
Mar 2, 2012
1 parent
f2f3e70
commit 7f4e210
Showing
1 changed file
with
67 additions
and
0 deletions.
There are no files selected for viewing
67 changes: 67 additions & 0 deletions
67
target/linux/generic/patches-3.2/550-ubifs-symlink-xattr-support.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,67 @@ | ||
--- a/fs/ubifs/file.c | ||
+++ b/fs/ubifs/file.c | ||
@@ -1575,6 +1575,12 @@ const struct inode_operations ubifs_syml | ||
.follow_link = ubifs_follow_link, | ||
.setattr = ubifs_setattr, | ||
.getattr = ubifs_getattr, | ||
+#ifdef CONFIG_UBIFS_FS_XATTR | ||
+ .setxattr = ubifs_setxattr, | ||
+ .getxattr = ubifs_getxattr, | ||
+ .listxattr = ubifs_listxattr, | ||
+ .removexattr = ubifs_removexattr, | ||
+#endif | ||
}; | ||
|
||
const struct file_operations ubifs_file_operations = { | ||
--- a/fs/ubifs/journal.c | ||
+++ b/fs/ubifs/journal.c | ||
@@ -553,7 +553,8 @@ int ubifs_jnl_update(struct ubifs_info * | ||
|
||
dbg_jnl("ino %lu, dent '%.*s', data len %d in dir ino %lu", | ||
inode->i_ino, nm->len, nm->name, ui->data_len, dir->i_ino); | ||
- ubifs_assert(dir_ui->data_len == 0); | ||
+ if (!xent) | ||
+ ubifs_assert(dir_ui->data_len == 0); | ||
ubifs_assert(mutex_is_locked(&dir_ui->ui_mutex)); | ||
|
||
dlen = UBIFS_DENT_NODE_SZ + nm->len + 1; | ||
@@ -573,6 +574,13 @@ int ubifs_jnl_update(struct ubifs_info * | ||
aligned_dlen = ALIGN(dlen, 8); | ||
aligned_ilen = ALIGN(ilen, 8); | ||
len = aligned_dlen + aligned_ilen + UBIFS_INO_NODE_SZ; | ||
+ if (xent) { | ||
+ /* | ||
+ * Make sure to account for dir_ui->data_len in | ||
+ * length calculation in case there is extended attribute. | ||
+ */ | ||
+ len += dir_ui->data_len; | ||
+ } | ||
dent = kmalloc(len, GFP_NOFS); | ||
if (!dent) | ||
return -ENOMEM; | ||
@@ -649,7 +657,8 @@ int ubifs_jnl_update(struct ubifs_info * | ||
|
||
ino_key_init(c, &ino_key, dir->i_ino); | ||
ino_offs += aligned_ilen; | ||
- err = ubifs_tnc_add(c, &ino_key, lnum, ino_offs, UBIFS_INO_NODE_SZ); | ||
+ err = ubifs_tnc_add(c, &ino_key, lnum, ino_offs, | ||
+ UBIFS_INO_NODE_SZ + dir_ui->data_len); | ||
if (err) | ||
goto out_ro; | ||
|
||
--- a/fs/ubifs/xattr.c | ||
+++ b/fs/ubifs/xattr.c | ||
@@ -211,12 +211,12 @@ static int change_xattr(struct ubifs_inf | ||
} | ||
memcpy(ui->data, value, size); | ||
inode->i_size = ui->ui_size = size; | ||
- ui->data_len = size; | ||
|
||
mutex_lock(&host_ui->ui_mutex); | ||
host->i_ctime = ubifs_current_time(host); | ||
host_ui->xattr_size -= CALC_XATTR_BYTES(ui->data_len); | ||
host_ui->xattr_size += CALC_XATTR_BYTES(size); | ||
+ ui->data_len = size; | ||
|
||
/* | ||
* It is important to write the host inode after the xattr inode |