diff options
| author |   Jeff Layton <jlayton@kernel.org> | 2019-12-05 08:41:25 -0500 |
|---|---|---|
| committer |   Ilya Dryomov <idryomov@gmail.com> | 2020-01-27 16:53:39 +0100 |
| commit | 9a6bed4fe0c8bf57785cbc4db9f86086cb9b193d (patch) | |
| tree | ffef568fe314a8fc6f67462f2500c421c9ecbb83 /fs/ceph/inode.c | |
| parent | ceph: drop unused ttl_from parameter from fill_inode (diff) | |
| download | linux-dev-9a6bed4fe0c8bf57785cbc4db9f86086cb9b193d.tar.xz linux-dev-9a6bed4fe0c8bf57785cbc4db9f86086cb9b193d.zip | |
ceph: ensure we have a new cap before continuing in fill_inode
If the caller passes in a NULL cap_reservation, and we can't allocate
one then ensure that we fail gracefully.
Signed-off-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Diffstat (limited to 'fs/ceph/inode.c')
| -rw-r--r-- | fs/ceph/inode.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c index 5bdc1afc2bee..b5f068582970 100644 --- a/fs/ceph/inode.c +++ b/fs/ceph/inode.c @@ -753,8 +753,11 @@ static int fill_inode(struct inode *inode, struct page *locked_page, info_caps = le32_to_cpu(info->cap.caps); /* prealloc new cap struct */ - if (info_caps && ceph_snap(inode) == CEPH_NOSNAP) + if (info_caps && ceph_snap(inode) == CEPH_NOSNAP) { new_cap = ceph_get_cap(mdsc, caps_reservation); + if (!new_cap) + return -ENOMEM; + } /* * prealloc xattr data, if it looks like we'll need it. only |