diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-12-01 12:02:23 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-12-01 12:02:23 +0800 |
| commit | a5e9874fc9e05e8471bfd58cabd75a3432d38ba6 (patch) | |
| tree | ff0a388af912d9a20635ea8bae6f82e660dcf427 /fs/ceph/file.c | |
| parent | 0a2aefa1f71da3bb10634918c68f6fb0068c1052 (diff) | |
| parent | 8576fa45c10e665bb72931a31461c7310f3c5494 (diff) | |
Merge tag 'v4.1.36' into linux-linaro-lsk-v4.1lsk-v4.1-16.12
This is the 4.1.36 stable release
Diffstat (limited to 'fs/ceph/file.c')
| -rw-r--r-- | fs/ceph/file.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/ceph/file.c b/fs/ceph/file.c index 3b6b522b4b31..5ae447cbd2b5 100644 --- a/fs/ceph/file.c +++ b/fs/ceph/file.c @@ -868,7 +868,8 @@ again: statret = __ceph_do_getattr(inode, page, CEPH_STAT_CAP_INLINE_DATA, !!page); if (statret < 0) { - __free_page(page); + if (page) + __free_page(page); if (statret == -ENODATA) { BUG_ON(retry_op != READ_INLINE); goto again; |