mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-02-27 15:15:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'upstream-4.8-rc4' of git://git.infradead.org/linux-ubifs

Browse Source 
Pull UBIFS fixes from Richard Weinberger:
 "This pull requests contains fixes for two issues in UBI and UBIFS:

   - wrong UBIFS assertion.
   - a UBIFS xattr regression"

* tag 'upstream-4.8-rc4' of git://git.infradead.org/linux-ubifs:
  ubifs: Fix xattr generic handler usage
  ubifs: Fix assertion in layout_in_gaps()
This commit is contained in:
Linus Torvalds
2016-08-24 15:54:41 -04:00
parent fe2dd21282 17ce1eb0b6
commit 94ef71a99a
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fs/ubifs/tnc_commit.c
View File

@@ -370,7 +370,7 @@ static int layout_in_gaps(struct ubifs_info *c, int cnt)
p = c->gap_lebs;
do {
ubifs_assert(p < c->gap_lebs + sizeof(int) * c->lst.idx_lebs);
ubifs_assert(p < c->gap_lebs + c->lst.idx_lebs);
written = layout_leb_in_gaps(c, p);
if (written < 0) {
err = written;

5
fs/ubifs/xattr.c
View File

@@ -575,7 +575,8 @@ static int ubifs_xattr_get(const struct xattr_handler *handler,
dbg_gen("xattr '%s', ino %lu ('%pd'), buf size %zd", name,
inode->i_ino, dentry, size);
return __ubifs_getxattr(inode, name, buffer, size);
name = xattr_full_name(handler, name);
return __ubifs_getxattr(inode, name, buffer, size);
}
static int ubifs_xattr_set(const struct xattr_handler *handler,
@@ -586,6 +587,8 @@ static int ubifs_xattr_set(const struct xattr_handler *handler,
dbg_gen("xattr '%s', host ino %lu ('%pd'), size %zd",
name, inode->i_ino, dentry, size);
name = xattr_full_name(handler, name);
if (value)
return __ubifs_setxattr(inode, name, value, size, flags);
else