Updated from Linux LTS 3.10.21 to 3.10.22
This commit is contained in:
@@ -3306,11 +3306,13 @@ static __u16 ACL_to_cifs_posix(char *parm_data, const char *pACL,
|
||||
return 0;
|
||||
}
|
||||
cifs_acl->version = cpu_to_le16(1);
|
||||
if (acl_type == ACL_TYPE_ACCESS)
|
||||
if (acl_type == ACL_TYPE_ACCESS) {
|
||||
cifs_acl->access_entry_count = cpu_to_le16(count);
|
||||
else if (acl_type == ACL_TYPE_DEFAULT)
|
||||
cifs_acl->default_entry_count = __constant_cpu_to_le16(0xFFFF);
|
||||
} else if (acl_type == ACL_TYPE_DEFAULT) {
|
||||
cifs_acl->default_entry_count = cpu_to_le16(count);
|
||||
else {
|
||||
cifs_acl->access_entry_count = __constant_cpu_to_le16(0xFFFF);
|
||||
} else {
|
||||
cifs_dbg(FYI, "unknown ACL type %d\n", acl_type);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -498,6 +498,7 @@ static void devpts_kill_sb(struct super_block *sb)
|
||||
{
|
||||
struct pts_fs_info *fsi = DEVPTS_SB(sb);
|
||||
|
||||
ida_destroy(&fsi->allocated_ptys);
|
||||
kfree(fsi);
|
||||
kill_litter_super(sb);
|
||||
}
|
||||
|
||||
@@ -2288,6 +2288,7 @@ static int may_delete(struct inode *dir,struct dentry *victim,int isdir)
|
||||
*/
|
||||
static inline int may_create(struct inode *dir, struct dentry *child)
|
||||
{
|
||||
audit_inode_child(dir, child, AUDIT_TYPE_CHILD_CREATE);
|
||||
if (child->d_inode)
|
||||
return -EEXIST;
|
||||
if (IS_DEADDIR(dir))
|
||||
|
||||
Reference in New Issue
Block a user