diff options
| author | Maciej Wereski <m.wereski@partner.samsung.com> | 2015-04-02 17:36:13 +0200 |
|---|---|---|
| committer | Maciej Wereski <m.wereski@partner.samsung.com> | 2015-04-03 10:46:51 +0200 |
| commit | b8f4e02b063e1ff25fad8c4d7c40e99206862411 (patch) | |
| tree | dc087220a3069d5d82650645d79cab05d4aead07 | |
| parent | 130c00bd8f27b3112c56c9810e40d725ef064b05 (diff) | |
| download | linux-3.10-b8f4e02b063e1ff25fad8c4d7c40e99206862411.tar.gz linux-3.10-b8f4e02b063e1ff25fad8c4d7c40e99206862411.tar.bz2 linux-3.10-b8f4e02b063e1ff25fad8c4d7c40e99206862411.zip | |
temp fix
Change-Id: I4560164cc3ac614dc008e57aa45aeee9fe5f01bc
Signed-off-by: Maciej Wereski <m.wereski@partner.samsung.com>
| -rw-r--r-- | ipc/kdbus/fs.c | 2 | ||||
| -rw-r--r-- | ipc/kdbus/handle.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ipc/kdbus/fs.c b/ipc/kdbus/fs.c index d01f33baaa0..d6c9fe3f3bf 100644 --- a/ipc/kdbus/fs.c +++ b/ipc/kdbus/fs.c @@ -263,7 +263,7 @@ static void fs_super_sop_evict_inode(struct inode *inode) { struct kdbus_node *node = kdbus_node_from_inode(inode); - truncate_inode_pages_final(&inode->i_data); + truncate_inode_pages(&inode->i_data, 0); clear_inode(inode); kdbus_node_unref(node); } diff --git a/ipc/kdbus/handle.c b/ipc/kdbus/handle.c index f72dbe513b4..bda6b2c8bdb 100644 --- a/ipc/kdbus/handle.c +++ b/ipc/kdbus/handle.c @@ -346,7 +346,7 @@ static long kdbus_handle_ioctl_control(struct file *file, unsigned int cmd, bus = kdbus_cmd_bus_make(domain, argp); if (IS_ERR_OR_NULL(bus)) { - ret = PTR_ERR_OR_ZERO(bus); + ret = PTR_ERR(bus); break; } @@ -387,7 +387,7 @@ static long kdbus_handle_ioctl_ep(struct file *file, unsigned int cmd, ep = kdbus_cmd_ep_make(file_ep->bus, buf); if (IS_ERR_OR_NULL(ep)) { - ret = PTR_ERR_OR_ZERO(ep); + ret = PTR_ERR(ep); break; } @@ -398,7 +398,7 @@ static long kdbus_handle_ioctl_ep(struct file *file, unsigned int cmd, case KDBUS_CMD_HELLO: conn = kdbus_cmd_hello(file_ep, handle->privileged, buf); if (IS_ERR_OR_NULL(conn)) { - ret = PTR_ERR_OR_ZERO(conn); + ret = PTR_ERR(conn); break; } |