]> git.michaelhowe.org Git - packages/o/openafs.git/commitdiff
Linux 3.13: Check return value from bdi_init
authorMarc Dionne <marc.dionne@your-file-system.com>
Tue, 3 Dec 2013 19:10:00 +0000 (14:10 -0500)
committerStephan Wiesand <stephan.wiesand@desy.de>
Tue, 21 Jun 2016 13:45:57 +0000 (09:45 -0400)
The use of the bdi_init function now gets a warning because the
return value is unused and the function is now defined with
the warn_unused_result attribute.

Assign and check the return value.

Reviewed-on: http://gerrit.openafs.org/10530
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Andrew Deason <adeason@sinenomine.net>
Reviewed-by: Derrick Brashear <shadow@your-file-system.com>
(cherry picked from commit ccc5d3f7adceda4d8cf41f04fe02d5cfe376befd)

Change-Id: I2ccd9bbdce396a003030e3e09f9f6d75a1c4fa7c
Reviewed-on: https://gerrit.openafs.org/12274
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Mark Vitale <mvitale@sinenomine.net>
Reviewed-by: Michael Meffie <mmeffie@sinenomine.net>
Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>
Tested-by: Stephan Wiesand <stephan.wiesand@desy.de>
src/afs/LINUX/osi_vfsops.c

index 3936d4d054bcb938fe447a12fd4bcb9171cc84da..c2226684b3b766d88fb96b57e8e8e8af5f9b552e 100644 (file)
@@ -87,6 +87,9 @@ int
 afs_fill_super(struct super_block *sb, void *data, int silent)
 {
     int code = 0;
+#if defined(HAVE_LINUX_BDI_INIT)
+    int bdi_init_done = 0;
+#endif
 
     AFS_GLOCK();
     if (afs_was_mounted) {
@@ -115,7 +118,10 @@ afs_fill_super(struct super_block *sb, void *data, int silent)
     afs_backing_dev_info = kmalloc(sizeof(struct backing_dev_info), GFP_NOFS);
     memset(afs_backing_dev_info, 0, sizeof(struct backing_dev_info));
 #if defined(HAVE_LINUX_BDI_INIT)
-    bdi_init(afs_backing_dev_info);
+    code = bdi_init(afs_backing_dev_info);
+    if (code)
+       goto out;
+    bdi_init_done = 1;
 #endif
 #if defined(STRUCT_BACKING_DEV_INFO_HAS_NAME)
     afs_backing_dev_info->name = "openafs";
@@ -144,11 +150,13 @@ afs_fill_super(struct super_block *sb, void *data, int silent)
 #endif
 #endif
     code = afs_root(sb);
+out:
     if (code) {
        afs_globalVFS = NULL;
        afs_FlushAllVCaches();
 #if defined(HAVE_LINUX_BDI_INIT)
-       bdi_destroy(afs_backing_dev_info);
+       if (bdi_init_done)
+           bdi_destroy(afs_backing_dev_info);
 #endif
        kfree(afs_backing_dev_info);
         module_put(THIS_MODULE);