diff options
| author | Chanho Park <chanho61.park@samsung.com> | 2014-08-19 21:40:27 +0900 |
|---|---|---|
| committer | Chanho Park <chanho61.park@samsung.com> | 2014-11-21 19:12:21 +0900 |
| commit | e1a318b9b57459588a1f8db97ff4b21fe39e2d2f (patch) | |
| tree | 81871a99701d0f28819e06a9d3a6ca357c9abb13 /drivers/base | |
| parent | 47b1090fabaf254ea4440964a6dfbe7d55a41db1 (diff) | |
| download | linux-3.10-e1a318b9b57459588a1f8db97ff4b21fe39e2d2f.tar.gz linux-3.10-e1a318b9b57459588a1f8db97ff4b21fe39e2d2f.tar.bz2 linux-3.10-e1a318b9b57459588a1f8db97ff4b21fe39e2d2f.zip | |
Revert "dma-buf: add lock callback for fcntl system call."
This reverts commit 30d585606b85e454113b79478b6b6bb1991dd210.
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/dma-buf.c | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/drivers/base/dma-buf.c b/drivers/base/dma-buf.c index 3d2d12bd058..3e76bbe23d6 100644 --- a/drivers/base/dma-buf.c +++ b/drivers/base/dma-buf.c @@ -80,42 +80,9 @@ static int dma_buf_mmap_internal(struct file *file, struct vm_area_struct *vma) return dmabuf->ops->mmap(dmabuf, vma); } -static int dma_buf_lock(struct file *file, int cmd, struct file_lock *fl) -{ - struct dma_buf *dmabuf; - unsigned int type; - bool wait = false; - - if (!is_dma_buf_file(file)) - return -EINVAL; - - dmabuf = file->private_data; - - if ((fl->fl_type & F_UNLCK) == F_UNLCK) { - dmabuf_sync_single_unlock(dmabuf); - return 0; - } - - /* convert flock type to dmabuf sync type. */ - if ((fl->fl_type & F_WRLCK) == F_WRLCK) - type = DMA_BUF_ACCESS_W; - else if ((fl->fl_type & F_RDLCK) == F_RDLCK) - type = DMA_BUF_ACCESS_R; - else - return -EINVAL; - - if (fl->fl_flags & FL_SLEEP) - wait = true; - - /* TODO. the locking to certain region should also be considered. */ - - return dmabuf_sync_single_lock(dmabuf, type, wait); -} - static const struct file_operations dma_buf_fops = { .release = dma_buf_release, .mmap = dma_buf_mmap_internal, - .lock = dma_buf_lock, }; /* |