A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-28 02:32:09 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into for-2.6.35

Browse source 
Conflicts:
	fs/block_dev.c

Signed-off-by: Jens Axboe <[email protected]>
This commit is contained in:
Jens Axboe 2010-04-29 09:36:24 +02:00
commit 7407cf355f
486 changed files with 7888 additions and 3098 deletions
Download patch file Download diff file Expand all files Collapse all files

2
fs/reiserfs/dir.c
View file

@ -46,8 +46,6 @@ static inline bool is_privroot_deh(struct dentry *dir,
struct reiserfs_de_head *deh)
{
struct dentry *privroot = REISERFS_SB(dir->d_sb)->priv_root;
if (reiserfs_expose_privroot(dir->d_sb))
return 0;
return (dir == dir->d_parent && privroot->d_inode &&
deh->deh_objectid == INODE_PKEY(privroot->d_inode)->k_objectid);
}

19
fs/reiserfs/xattr.c
View file

@ -554,7 +554,7 @@ reiserfs_xattr_set_handle(struct reiserfs_transaction_handle *th,
if (!err && new_size < i_size_read(dentry->d_inode)) {
struct iattr newattrs = {
.ia_ctime = current_fs_time(inode->i_sb),
.ia_size = buffer_size,
.ia_size = new_size,
.ia_valid = ATTR_SIZE | ATTR_CTIME,
};
@ -973,21 +973,13 @@ int reiserfs_permission(struct inode *inode, int mask)
return generic_permission(inode, mask, NULL);
}
/* This will catch lookups from the fs root to .reiserfs_priv */
static int
xattr_lookup_poison(struct dentry *dentry, struct qstr *q1, struct qstr *name)
static int xattr_hide_revalidate(struct dentry *dentry, struct nameidata *nd)
{
struct dentry *priv_root = REISERFS_SB(dentry->d_sb)->priv_root;
if (container_of(q1, struct dentry, d_name) == priv_root)
return -ENOENT;
if (q1->len == name->len &&
!memcmp(q1->name, name->name, name->len))
return 0;
return 1;
return -EPERM;
}
static const struct dentry_operations xattr_lookup_poison_ops = {
.d_compare = xattr_lookup_poison,
.d_revalidate = xattr_hide_revalidate,
};
int reiserfs_lookup_privroot(struct super_block *s)
@ -1001,8 +993,7 @@ int reiserfs_lookup_privroot(struct super_block *s)
strlen(PRIVROOT_NAME));
if (!IS_ERR(dentry)) {
REISERFS_SB(s)->priv_root = dentry;
if (!reiserfs_expose_privroot(s))
s->s_root->d_op = &xattr_lookup_poison_ops;
dentry->d_op = &xattr_lookup_poison_ops;
if (dentry->d_inode)
dentry->d_inode->i_flags |= S_PRIVATE;
} else