lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'for_linus' into for_linus_merged

Browse Source 
Conflicts:
	fs/ext4/ioctl.c
This commit is contained in:
Theodore Ts'o
2012-01-10 11:54:07 -05:00
parent e4e11180df d50f2ab6f0
commit ff9cb1c4ee
16 changed files with 1103 additions and 487 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
fs/ext4/xattr_security.c
View File

@ -47,8 +47,9 @@ ext4_xattr_security_set(struct dentry *dentry, const char *name,
name, value, size, flags);
}
int ext4_initxattrs(struct inode *inode, const struct xattr *xattr_array,
void *fs_info)
static int
ext4_initxattrs(struct inode *inode, const struct xattr *xattr_array,
void *fs_info)
{
const struct xattr *xattr;
handle_t *handle = fs_info;