diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-26 23:16:07 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-26 23:16:07 -0500 |
| commit | d895cb1af15c04c522a25c79cc429076987c089b (patch) | |
| tree | 895dc9157e28f603d937a58be664e4e440d5530c /drivers/gpu | |
| parent | 9626357371b519f2b955fef399647181034a77fe (diff) | |
| parent | d3d009cb965eae7e002ea5badf603ea8f4c34915 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vfs pile (part one) from Al Viro:
"Assorted stuff - cleaning namei.c up a bit, fixing ->d_name/->d_parent
locking violations, etc.
The most visible changes here are death of FS_REVAL_DOT (replaced with
"has ->d_weak_revalidate()") and a new helper getting from struct file
to inode. Some bits of preparation to xattr method interface changes.
Misc patches by various people sent this cycle *and* ocfs2 fixes from
several cycles ago that should've been upstream right then.
PS: the next vfs pile will be xattr stuff."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (46 commits)
saner proc_get_inode() calling conventions
proc: avoid extra pde_put() in proc_fill_super()
fs: change return values from -EACCES to -EPERM
fs/exec.c: make bprm_mm_init() static
ocfs2/dlm: use GFP_ATOMIC inside a spin_lock
ocfs2: fix possible use-after-free with AIO
ocfs2: Fix oops in ocfs2_fast_symlink_readpage() code path
get_empty_filp()/alloc_file() leave both ->f_pos and ->f_version zero
target: writev() on single-element vector is pointless
export kernel_write(), convert open-coded instances
fs: encode_fh: return FILEID_INVALID if invalid fid_type
kill f_vfsmnt
vfs: kill FS_REVAL_DOT by adding a d_weak_revalidate dentry op
nfsd: handle vfs_getattr errors in acl protocol
switch vfs_getattr() to struct path
default SET_PERSONALITY() in linux/elf.h
ceph: prepopulate inodes only when request is aborted
d_hash_and_lookup(): export, switch open-coded instances
9p: switch v9fs_set_create_acl() to inode+fid, do it before d_instantiate()
9p: split dropping the acls from v9fs_set_create_acl()
...
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/gma500/gtt.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 10 | ||||
| -rw-r--r-- | drivers/gpu/drm/omapdrm/omap_gem_helpers.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/ttm/ttm_tt.c | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/udl/udl_gem.c | 2 |
5 files changed, 10 insertions, 10 deletions
diff --git a/drivers/gpu/drm/gma500/gtt.c b/drivers/gpu/drm/gma500/gtt.c index 04a371aceb34..054e26e769ec 100644 --- a/drivers/gpu/drm/gma500/gtt.c +++ b/drivers/gpu/drm/gma500/gtt.c | |||
| @@ -202,7 +202,7 @@ static int psb_gtt_attach_pages(struct gtt_range *gt) | |||
| 202 | WARN_ON(gt->pages); | 202 | WARN_ON(gt->pages); |
| 203 | 203 | ||
| 204 | /* This is the shared memory object that backs the GEM resource */ | 204 | /* This is the shared memory object that backs the GEM resource */ |
| 205 | inode = gt->gem.filp->f_path.dentry->d_inode; | 205 | inode = file_inode(gt->gem.filp); |
| 206 | mapping = inode->i_mapping; | 206 | mapping = inode->i_mapping; |
| 207 | 207 | ||
| 208 | gt->pages = kmalloc(pages * sizeof(struct page *), GFP_KERNEL); | 208 | gt->pages = kmalloc(pages * sizeof(struct page *), GFP_KERNEL); |
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 8413ffced815..0e207e6e0df8 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c | |||
| @@ -1618,7 +1618,7 @@ i915_gem_object_truncate(struct drm_i915_gem_object *obj) | |||
| 1618 | * To do this we must instruct the shmfs to drop all of its | 1618 | * To do this we must instruct the shmfs to drop all of its |
| 1619 | * backing pages, *now*. | 1619 | * backing pages, *now*. |
| 1620 | */ | 1620 | */ |
| 1621 | inode = obj->base.filp->f_path.dentry->d_inode; | 1621 | inode = file_inode(obj->base.filp); |
| 1622 | shmem_truncate_range(inode, 0, (loff_t)-1); | 1622 | shmem_truncate_range(inode, 0, (loff_t)-1); |
| 1623 | 1623 | ||
| 1624 | obj->madv = __I915_MADV_PURGED; | 1624 | obj->madv = __I915_MADV_PURGED; |
| @@ -1783,7 +1783,7 @@ i915_gem_object_get_pages_gtt(struct drm_i915_gem_object *obj) | |||
| 1783 | * | 1783 | * |
| 1784 | * Fail silently without starting the shrinker | 1784 | * Fail silently without starting the shrinker |
| 1785 | */ | 1785 | */ |
| 1786 | mapping = obj->base.filp->f_path.dentry->d_inode->i_mapping; | 1786 | mapping = file_inode(obj->base.filp)->i_mapping; |
| 1787 | gfp = mapping_gfp_mask(mapping); | 1787 | gfp = mapping_gfp_mask(mapping); |
| 1788 | gfp |= __GFP_NORETRY | __GFP_NOWARN | __GFP_NO_KSWAPD; | 1788 | gfp |= __GFP_NORETRY | __GFP_NOWARN | __GFP_NO_KSWAPD; |
| 1789 | gfp &= ~(__GFP_IO | __GFP_WAIT); | 1789 | gfp &= ~(__GFP_IO | __GFP_WAIT); |
| @@ -3747,7 +3747,7 @@ struct drm_i915_gem_object *i915_gem_alloc_object(struct drm_device *dev, | |||
| 3747 | mask |= __GFP_DMA32; | 3747 | mask |= __GFP_DMA32; |
| 3748 | } | 3748 | } |
| 3749 | 3749 | ||
| 3750 | mapping = obj->base.filp->f_path.dentry->d_inode->i_mapping; | 3750 | mapping = file_inode(obj->base.filp)->i_mapping; |
| 3751 | mapping_set_gfp_mask(mapping, mask); | 3751 | mapping_set_gfp_mask(mapping, mask); |
| 3752 | 3752 | ||
| 3753 | i915_gem_object_init(obj, &i915_gem_object_ops); | 3753 | i915_gem_object_init(obj, &i915_gem_object_ops); |
| @@ -4232,7 +4232,7 @@ void i915_gem_free_all_phys_object(struct drm_device *dev) | |||
| 4232 | void i915_gem_detach_phys_object(struct drm_device *dev, | 4232 | void i915_gem_detach_phys_object(struct drm_device *dev, |
| 4233 | struct drm_i915_gem_object *obj) | 4233 | struct drm_i915_gem_object *obj) |
| 4234 | { | 4234 | { |
| 4235 | struct address_space *mapping = obj->base.filp->f_path.dentry->d_inode->i_mapping; | 4235 | struct address_space *mapping = file_inode(obj->base.filp)->i_mapping; |
| 4236 | char *vaddr; | 4236 | char *vaddr; |
| 4237 | int i; | 4237 | int i; |
| 4238 | int page_count; | 4238 | int page_count; |
| @@ -4268,7 +4268,7 @@ i915_gem_attach_phys_object(struct drm_device *dev, | |||
| 4268 | int id, | 4268 | int id, |
| 4269 | int align) | 4269 | int align) |
| 4270 | { | 4270 | { |
| 4271 | struct address_space *mapping = obj->base.filp->f_path.dentry->d_inode->i_mapping; | 4271 | struct address_space *mapping = file_inode(obj->base.filp)->i_mapping; |
| 4272 | drm_i915_private_t *dev_priv = dev->dev_private; | 4272 | drm_i915_private_t *dev_priv = dev->dev_private; |
| 4273 | int ret = 0; | 4273 | int ret = 0; |
| 4274 | int page_count; | 4274 | int page_count; |
diff --git a/drivers/gpu/drm/omapdrm/omap_gem_helpers.c b/drivers/gpu/drm/omapdrm/omap_gem_helpers.c index e4a66a35fc6a..f9eb679eb79b 100644 --- a/drivers/gpu/drm/omapdrm/omap_gem_helpers.c +++ b/drivers/gpu/drm/omapdrm/omap_gem_helpers.c | |||
| @@ -40,7 +40,7 @@ struct page **_drm_gem_get_pages(struct drm_gem_object *obj, gfp_t gfpmask) | |||
| 40 | int i, npages; | 40 | int i, npages; |
| 41 | 41 | ||
| 42 | /* This is the shared memory object that backs the GEM resource */ | 42 | /* This is the shared memory object that backs the GEM resource */ |
| 43 | inode = obj->filp->f_path.dentry->d_inode; | 43 | inode = file_inode(obj->filp); |
| 44 | mapping = inode->i_mapping; | 44 | mapping = inode->i_mapping; |
| 45 | 45 | ||
| 46 | npages = obj->size >> PAGE_SHIFT; | 46 | npages = obj->size >> PAGE_SHIFT; |
diff --git a/drivers/gpu/drm/ttm/ttm_tt.c b/drivers/gpu/drm/ttm/ttm_tt.c index 7d759a430294..5e93a52d4f2c 100644 --- a/drivers/gpu/drm/ttm/ttm_tt.c +++ b/drivers/gpu/drm/ttm/ttm_tt.c | |||
| @@ -296,7 +296,7 @@ int ttm_tt_swapin(struct ttm_tt *ttm) | |||
| 296 | swap_storage = ttm->swap_storage; | 296 | swap_storage = ttm->swap_storage; |
| 297 | BUG_ON(swap_storage == NULL); | 297 | BUG_ON(swap_storage == NULL); |
| 298 | 298 | ||
| 299 | swap_space = swap_storage->f_path.dentry->d_inode->i_mapping; | 299 | swap_space = file_inode(swap_storage)->i_mapping; |
| 300 | 300 | ||
| 301 | for (i = 0; i < ttm->num_pages; ++i) { | 301 | for (i = 0; i < ttm->num_pages; ++i) { |
| 302 | from_page = shmem_read_mapping_page(swap_space, i); | 302 | from_page = shmem_read_mapping_page(swap_space, i); |
| @@ -345,7 +345,7 @@ int ttm_tt_swapout(struct ttm_tt *ttm, struct file *persistent_swap_storage) | |||
| 345 | } else | 345 | } else |
| 346 | swap_storage = persistent_swap_storage; | 346 | swap_storage = persistent_swap_storage; |
| 347 | 347 | ||
| 348 | swap_space = swap_storage->f_path.dentry->d_inode->i_mapping; | 348 | swap_space = file_inode(swap_storage)->i_mapping; |
| 349 | 349 | ||
| 350 | for (i = 0; i < ttm->num_pages; ++i) { | 350 | for (i = 0; i < ttm->num_pages; ++i) { |
| 351 | from_page = ttm->pages[i]; | 351 | from_page = ttm->pages[i]; |
diff --git a/drivers/gpu/drm/udl/udl_gem.c b/drivers/gpu/drm/udl/udl_gem.c index afd212c99216..3816270ba49b 100644 --- a/drivers/gpu/drm/udl/udl_gem.c +++ b/drivers/gpu/drm/udl/udl_gem.c | |||
| @@ -137,7 +137,7 @@ static int udl_gem_get_pages(struct udl_gem_object *obj, gfp_t gfpmask) | |||
| 137 | if (obj->pages == NULL) | 137 | if (obj->pages == NULL) |
| 138 | return -ENOMEM; | 138 | return -ENOMEM; |
| 139 | 139 | ||
| 140 | inode = obj->base.filp->f_path.dentry->d_inode; | 140 | inode = file_inode(obj->base.filp); |
| 141 | mapping = inode->i_mapping; | 141 | mapping = inode->i_mapping; |
| 142 | gfpmask |= mapping_gfp_mask(mapping); | 142 | gfpmask |= mapping_gfp_mask(mapping); |
| 143 | 143 | ||