diff options
| author | Kyle McMartin <kyle@redhat.com> | 2011-01-10 11:05:09 -0500 |
|---|---|---|
| committer | Kyle McMartin <kyle@redhat.com> | 2011-01-10 11:05:09 -0500 |
| commit | 4f860245a9fd41d35765a0f369ee34a499dc627d (patch) | |
| tree | 8ff7ac6be9dd548948966c07ab886336258b89f5 /fs-call-security_d_instantiate-in-d_obtain_alias.patch | |
| parent | 482441b552e5984853ef8c4570d6cf3a914838b0 (diff) | |
| download | kernel-4f860245a9fd41d35765a0f369ee34a499dc627d.tar.gz kernel-4f860245a9fd41d35765a0f369ee34a499dc627d.tar.xz kernel-4f860245a9fd41d35765a0f369ee34a499dc627d.zip | |
Branch for 2.6.38
- Rebase trivial patches.
- Switch debug configs back on.
- config changes:
DEBUG_SET_MODULE_RONX=y
B43_PHY_N=y
RT2800USB_RT33XX=y |
RT2800PCI_RT33XX=y | experimental
WL12XX=m
RTL8192CE=m
CAN_SLCAN=m
SCHED_AUTOGROUP=n
Diffstat (limited to 'fs-call-security_d_instantiate-in-d_obtain_alias.patch')
| -rw-r--r-- | fs-call-security_d_instantiate-in-d_obtain_alias.patch | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/fs-call-security_d_instantiate-in-d_obtain_alias.patch b/fs-call-security_d_instantiate-in-d_obtain_alias.patch index b151c0a70..3bce47f5e 100644 --- a/fs-call-security_d_instantiate-in-d_obtain_alias.patch +++ b/fs-call-security_d_instantiate-in-d_obtain_alias.patch @@ -39,14 +39,15 @@ V1->V2: 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/fs/dcache.c b/fs/dcache.c -index 23702a9..119d489 100644 +index 5699d4c..85388fc 100644 --- a/fs/dcache.c +++ b/fs/dcache.c -@@ -1201,9 +1201,12 @@ struct dentry *d_obtain_alias(struct inode *inode) +@@ -1577,9 +1577,13 @@ struct dentry *d_obtain_alias(struct inode *inode) spin_unlock(&tmp->d_lock); + spin_unlock(&inode->i_lock); - spin_unlock(&dcache_lock); + security_d_instantiate(tmp, inode); ++ return tmp; out_iput: @@ -55,8 +56,6 @@ index 23702a9..119d489 100644 iput(inode); return res; } --- -1.6.6.1 -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in |