gfs2: move check_journal_clean to util.c for future use

[linux-2.6-microblaze.git] / fs / gfs2 / ops_fstype.c

diff --git a/fs/gfs2/ops_fstype.c b/fs/gfs2/ops_fstype.c
index b3e904b..d19ee57 100644 (file)
--- a/fs/gfs2/ops_fstype.c
+++ b/fs/gfs2/ops_fstype.c
@@ -600,48 +600,6 @@ static int gfs2_jindex_hold(struct gfs2_sbd *sdp, struct gfs2_holder *ji_gh)
        return error;
 }
 
-/**
- * check_journal_clean - Make sure a journal is clean for a spectator mount
- * @sdp: The GFS2 superblock
- * @jd: The journal descriptor
- *
- * Returns: 0 if the journal is clean or locked, else an error
- */
-static int check_journal_clean(struct gfs2_sbd *sdp, struct gfs2_jdesc *jd)
-{
-       int error;
-       struct gfs2_holder j_gh;
-       struct gfs2_log_header_host head;
-       struct gfs2_inode *ip;
-
-       ip = GFS2_I(jd->jd_inode);
-       error = gfs2_glock_nq_init(ip->i_gl, LM_ST_SHARED, LM_FLAG_NOEXP |
-                                  GL_EXACT | GL_NOCACHE, &j_gh);
-       if (error) {
-               fs_err(sdp, "Error locking journal for spectator mount.\n");
-               return -EPERM;
-       }
-       error = gfs2_jdesc_check(jd);
-       if (error) {
-               fs_err(sdp, "Error checking journal for spectator mount.\n");
-               goto out_unlock;
-       }
-       error = gfs2_find_jhead(jd, &head, false);
-       if (error) {
-               fs_err(sdp, "Error parsing journal for spectator mount.\n");
-               goto out_unlock;
-       }
-       if (!(head.lh_flags & GFS2_LOG_HEAD_UNMOUNT)) {
-               error = -EPERM;
-               fs_err(sdp, "jid=%u: Journal is dirty, so the first mounter "
-                      "must not be a spectator.\n", jd->jd_jid);
-       }
-
-out_unlock:
-       gfs2_glock_dq_uninit(&j_gh);
-       return error;
-}
-
 static int init_journal(struct gfs2_sbd *sdp, int undo)
 {
        struct inode *master = d_inode(sdp->sd_master_dir);