diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2018-10-23 13:19:54 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2018-10-23 13:19:54 +0200 |
| commit | a600ffe6ec609b0600ec590236f97f8d430e0984 (patch) | |
| tree | 57432877c74c80ab470d7b655a2e18a6b5168ee5 /fs/ubifs/super.c | |
| parent | d19031d32cd77b2878a006040e0f8e4183ca59ef (diff) | |
| parent | 23e542e5ba5e4298a1475f94750317ec1662ba21 (diff) | |
| download | talos-obmc-linux-a600ffe6ec609b0600ec590236f97f8d430e0984.tar.gz talos-obmc-linux-a600ffe6ec609b0600ec590236f97f8d430e0984.zip | |
Merge branch 'for-4.20/google' into for-linus
Whisker device specific fixes to hid-google driver
Diffstat (limited to 'fs/ubifs/super.c')
| -rw-r--r-- | fs/ubifs/super.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c index 23e7042666a7..bf000c8aeffb 100644 --- a/fs/ubifs/super.c +++ b/fs/ubifs/super.c @@ -1912,7 +1912,9 @@ static int ubifs_remount_fs(struct super_block *sb, int *flags, char *data) mutex_unlock(&c->bu_mutex); } - ubifs_assert(c, c->lst.taken_empty_lebs > 0); + if (!c->need_recovery) + ubifs_assert(c, c->lst.taken_empty_lebs > 0); + return 0; } @@ -1954,6 +1956,9 @@ static struct ubi_volume_desc *open_ubi(const char *name, int mode) int dev, vol; char *endptr; + if (!name || !*name) + return ERR_PTR(-EINVAL); + /* First, try to open using the device node path method */ ubi = ubi_open_volume_path(name, mode); if (!IS_ERR(ubi)) |
