Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit acfcbaf1 authored by Martin Brandenburg's avatar Martin Brandenburg Committed by Mike Marshall
Browse files

orangefs: make fs_mount_pending static 



Signed-off-by: default avatarMartin Brandenburg <martin@omnibond.com>
Signed-off-by: default avatarMike Marshall <hubcap@omnibond.com>
parent c62da585

fs/orangefs/devorangefs-req.c

+38 −38
Original line number Diff line number Diff line
@@ -74,6 +74,44 @@ static struct orangefs_kernel_op_s *orangefs_devreq_remove_op(__u64 tag) 
	return NULL;

}



/* Returns whether any FS are still pending remounted */

static int mark_all_pending_mounts(void)

{

	int unmounted = 1;

	struct orangefs_sb_info_s *orangefs_sb = NULL;



	spin_lock(&orangefs_superblocks_lock);

	list_for_each_entry(orangefs_sb, &orangefs_superblocks, list) {

		/* All of these file system require a remount */

		orangefs_sb->mount_pending = 1;

		unmounted = 0;

	}

	spin_unlock(&orangefs_superblocks_lock);

	return unmounted;

}



/*

 * Determine if a given file system needs to be remounted or not

 *  Returns -1 on error

 *           0 if already mounted

 *           1 if needs remount

 */

static int fs_mount_pending(__s32 fsid)

{

	int mount_pending = -1;

	struct orangefs_sb_info_s *orangefs_sb = NULL;



	spin_lock(&orangefs_superblocks_lock);

	list_for_each_entry(orangefs_sb, &orangefs_superblocks, list) {

		if (orangefs_sb->fs_id == fsid) {

			mount_pending = orangefs_sb->mount_pending;

			break;

		}

	}

	spin_unlock(&orangefs_superblocks_lock);

	return mount_pending;

}



static int orangefs_devreq_open(struct inode *inode, struct file *file)

{

	int ret = -EINVAL;
@@ -449,44 +487,6 @@ static ssize_t orangefs_devreq_write_iter(struct kiocb *iocb, 
	goto wakeup;

}



/* Returns whether any FS are still pending remounted */

static int mark_all_pending_mounts(void)

{

	int unmounted = 1;

	struct orangefs_sb_info_s *orangefs_sb = NULL;



	spin_lock(&orangefs_superblocks_lock);

	list_for_each_entry(orangefs_sb, &orangefs_superblocks, list) {

		/* All of these file system require a remount */

		orangefs_sb->mount_pending = 1;

		unmounted = 0;

	}

	spin_unlock(&orangefs_superblocks_lock);

	return unmounted;

}



/*

 * Determine if a given file system needs to be remounted or not

 *  Returns -1 on error

 *           0 if already mounted

 *           1 if needs remount

 */

int fs_mount_pending(__s32 fsid)

{

	int mount_pending = -1;

	struct orangefs_sb_info_s *orangefs_sb = NULL;



	spin_lock(&orangefs_superblocks_lock);

	list_for_each_entry(orangefs_sb, &orangefs_superblocks, list) {

		if (orangefs_sb->fs_id == fsid) {

			mount_pending = orangefs_sb->mount_pending;

			break;

		}

	}

	spin_unlock(&orangefs_superblocks_lock);

	return mount_pending;

}



/*

 * NOTE: gets called when the last reference to this device is dropped.

 * Using the open_access_count variable, we enforce a reference count

fs/orangefs/orangefs-kernel.h

+0 −1
Original line number Diff line number Diff line
@@ -523,7 +523,6 @@ int orangefs_dev_init(void); 
void orangefs_dev_cleanup(void);

int is_daemon_in_service(void);

bool __is_daemon_in_service(void);

int fs_mount_pending(__s32 fsid);



/*

 * defined in orangefs-utils.c