projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'compat-ioctl-5.5' of git://git.kernel.org:/pub/scm/linux/kernel/git/arnd...
[linux-2.6-microblaze.git]
/
fs
/
ocfs2
/
ioctl.c
diff --git
a/fs/ocfs2/ioctl.c
b/fs/ocfs2/ioctl.c
index
2d517b5
..
8998417
100644
(file)
--- a/
fs/ocfs2/ioctl.c
+++ b/
fs/ocfs2/ioctl.c
@@
-283,7
+283,7
@@
static int ocfs2_info_scan_inode_alloc(struct ocfs2_super *osb,
if (inode_alloc)
inode_lock(inode_alloc);
- if (o2info_coherent(&fi->ifi_req)) {
+ if (
inode_alloc &&
o2info_coherent(&fi->ifi_req)) {
status = ocfs2_inode_lock(inode_alloc, &bh, 0);
if (status < 0) {
mlog_errno(status);