diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-11-04 10:28:47 -0500 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-11-04 10:28:52 -0500 |
commit | 7f16e5c1416070dc590dd333a2d677700046a4ab (patch) | |
tree | 55718bbef64431e70d5ed282be516cd45b3f75e6 /fs/jfs | |
parent | 9d1cb9147dbe45f6e94dc796518ecf67cb64b359 (diff) | |
parent | 5e01dc7b26d9f24f39abace5da98ccbd6a5ceb52 (diff) |
Merge tag 'v3.12' into drm-intel-next
I want to merge in the new Broadwell support as a late hw enabling
pull request. But since the internal branch was based upon our
drm-intel-nightly integration branch I need to resolve all the
oustanding conflicts in drm/i915 with a backmerge to make the 60+
patches apply properly.
We'll propably have some fun because Linus will come up with a
slightly different merge solution.
Conflicts:
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/intel_crt.c
drivers/gpu/drm/i915/intel_ddi.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_dp.c
drivers/gpu/drm/i915/intel_drv.h
All rather simple adjacent lines changed or partial backports from
-next to -fixes, with the exception of the thaw code in i915_dma.c.
That one needed a bit of shuffling to restore the intent.
Oh and the massive header file reordering in intel_drv.h is a bit
trouble. But not much.
v2: Also don't forget the fixup for the silent conflict that results
in compile fail ...
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'fs/jfs')
-rw-r--r-- | fs/jfs/jfs_inode.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/jfs/jfs_inode.c b/fs/jfs/jfs_inode.c index c1a3e603279c..7f464c513ba0 100644 --- a/fs/jfs/jfs_inode.c +++ b/fs/jfs/jfs_inode.c | |||
@@ -95,7 +95,7 @@ struct inode *ialloc(struct inode *parent, umode_t mode) | |||
95 | 95 | ||
96 | if (insert_inode_locked(inode) < 0) { | 96 | if (insert_inode_locked(inode) < 0) { |
97 | rc = -EINVAL; | 97 | rc = -EINVAL; |
98 | goto fail_unlock; | 98 | goto fail_put; |
99 | } | 99 | } |
100 | 100 | ||
101 | inode_init_owner(inode, parent, mode); | 101 | inode_init_owner(inode, parent, mode); |
@@ -156,7 +156,6 @@ struct inode *ialloc(struct inode *parent, umode_t mode) | |||
156 | fail_drop: | 156 | fail_drop: |
157 | dquot_drop(inode); | 157 | dquot_drop(inode); |
158 | inode->i_flags |= S_NOQUOTA; | 158 | inode->i_flags |= S_NOQUOTA; |
159 | fail_unlock: | ||
160 | clear_nlink(inode); | 159 | clear_nlink(inode); |
161 | unlock_new_inode(inode); | 160 | unlock_new_inode(inode); |
162 | fail_put: | 161 | fail_put: |