diff options
| author | KalimochoAz <calimochoazucarado@gmail.com> | 2012-10-14 11:01:08 +0200 |
|---|---|---|
| committer | KalimochoAz <calimochoazucarado@gmail.com> | 2012-10-14 11:01:08 +0200 |
| commit | ac5ad2a19b7c3ffa766309c5ef3de0c79fa076c4 (patch) | |
| tree | 897cd35d5da5f71410aeb7525846790537ee6697 /fs | |
| parent | 50e2778ee890c3e0b7f2e9c876d85aa962abc997 (diff) | |
| parent | 24e842ae6cb8179126246ebcbfc477b36a7b8719 (diff) | |
| download | kernel_samsung_crespo-ac5ad2a19b7c3ffa766309c5ef3de0c79fa076c4.zip kernel_samsung_crespo-ac5ad2a19b7c3ffa766309c5ef3de0c79fa076c4.tar.gz kernel_samsung_crespo-ac5ad2a19b7c3ffa766309c5ef3de0c79fa076c4.tar.bz2 | |
Merge commit '24e842a' into HEAD
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/binfmt_elf.c | 19 | ||||
| -rw-r--r-- | fs/dcache.c | 6 |
2 files changed, 10 insertions, 15 deletions
diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c index 618493e..7e8299f 100644 --- a/fs/binfmt_elf.c +++ b/fs/binfmt_elf.c @@ -1669,30 +1669,19 @@ static int elf_note_info_init(struct elf_note_info *info) return 0; info->psinfo = kmalloc(sizeof(*info->psinfo), GFP_KERNEL); if (!info->psinfo) - goto notes_free; + return 0; info->prstatus = kmalloc(sizeof(*info->prstatus), GFP_KERNEL); if (!info->prstatus) - goto psinfo_free; + return 0; info->fpu = kmalloc(sizeof(*info->fpu), GFP_KERNEL); if (!info->fpu) - goto prstatus_free; + return 0; #ifdef ELF_CORE_COPY_XFPREGS info->xfpu = kmalloc(sizeof(*info->xfpu), GFP_KERNEL); if (!info->xfpu) - goto fpu_free; + return 0; #endif return 1; -#ifdef ELF_CORE_COPY_XFPREGS - fpu_free: - kfree(info->fpu); -#endif - prstatus_free: - kfree(info->prstatus); - psinfo_free: - kfree(info->psinfo); - notes_free: - kfree(info->notes); - return 0; } static int fill_note_info(struct elfhdr *elf, int phdrs, diff --git a/fs/dcache.c b/fs/dcache.c index bd8aaf6..8b64f38 100644 --- a/fs/dcache.c +++ b/fs/dcache.c @@ -1101,6 +1101,8 @@ positive: return 1; rename_retry: + if (locked) + goto again; locked = 1; write_seqlock(&rename_lock); goto again; @@ -1203,6 +1205,8 @@ out: rename_retry: if (found) return found; + if (locked) + goto again; locked = 1; write_seqlock(&rename_lock); goto again; @@ -2990,6 +2994,8 @@ resume: return; rename_retry: + if (locked) + goto again; locked = 1; write_seqlock(&rename_lock); goto again; |