Commit eb602521 authored by Yang Li's avatar Yang Li Committed by Andreas Gruenbacher
Browse files

gfs2: make function gfs2_make_fs_ro() to void type 



It fixes the following warning detected by coccinelle:
./fs/gfs2/super.c:592:5-10: Unneeded variable: "error". Return "0" on
line 628

Reported-by: default avatarAbaci Robot <abaci@linux.alibaba.com>
Signed-off-by: default avatarYang Li <yang.lee@linux.alibaba.com>
Signed-off-by: default avatarBob Peterson <rpeterso@redhat.com>
Signed-off-by: default avatarAndreas Gruenbacher <agruenba@redhat.com>
parent a38fd874

fs/gfs2/ops_fstype.c

+1 −3
Original line number Diff line number Diff line
@@ -1539,9 +1539,7 @@ static int gfs2_reconfigure(struct fs_context *fc) 
			return -EINVAL;



		if (fc->sb_flags & SB_RDONLY) {

			error = gfs2_make_fs_ro(sdp);

			if (error)

				errorfc(fc, "unable to remount read-only");

			gfs2_make_fs_ro(sdp);

		} else {

			error = gfs2_make_fs_rw(sdp);

			if (error)

fs/gfs2/super.c

+2 −8
Original line number Diff line number Diff line
@@ -587,9 +587,8 @@ static void gfs2_dirty_inode(struct inode *inode, int flags) 
 * Returns: errno

 */



int gfs2_make_fs_ro(struct gfs2_sbd *sdp)

void gfs2_make_fs_ro(struct gfs2_sbd *sdp)

{

	int error = 0;

	int log_write_allowed = test_bit(SDF_JOURNAL_LIVE, &sdp->sd_flags);



	gfs2_flush_delete_work(sdp);
@@ -624,8 +623,6 @@ int gfs2_make_fs_ro(struct gfs2_sbd *sdp) 


	if (!log_write_allowed)

		sdp->sd_vfs->s_flags |= SB_RDONLY;



	return error;

}



/**
@@ -637,7 +634,6 @@ int gfs2_make_fs_ro(struct gfs2_sbd *sdp) 
static void gfs2_put_super(struct super_block *sb)

{

	struct gfs2_sbd *sdp = sb->s_fs_info;

	int error;

	struct gfs2_jdesc *jd;



	/* No more recovery requests */
@@ -658,9 +654,7 @@ static void gfs2_put_super(struct super_block *sb) 
	spin_unlock(&sdp->sd_jindex_spin);



	if (!sb_rdonly(sb)) {

		error = gfs2_make_fs_ro(sdp);

		if (error)

			gfs2_io_error(sdp);

		gfs2_make_fs_ro(sdp);

	}

	WARN_ON(gfs2_withdrawing(sdp));

fs/gfs2/super.h

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ extern int gfs2_lookup_in_master_dir(struct gfs2_sbd *sdp, char *filename, 
				     struct gfs2_inode **ipp);



extern int gfs2_make_fs_rw(struct gfs2_sbd *sdp);

extern int gfs2_make_fs_ro(struct gfs2_sbd *sdp);

extern void gfs2_make_fs_ro(struct gfs2_sbd *sdp);

extern void gfs2_online_uevent(struct gfs2_sbd *sdp);

extern int gfs2_statfs_init(struct gfs2_sbd *sdp);

extern void gfs2_statfs_change(struct gfs2_sbd *sdp, s64 total, s64 free,

fs/gfs2/util.c

+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ static void signal_our_withdraw(struct gfs2_sbd *sdp) 
				ret = 0;

		}

		if (!ret)

			ret = gfs2_make_fs_ro(sdp);

			gfs2_make_fs_ro(sdp);

		gfs2_freeze_unlock(&freeze_gh);

	}