X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ffid%2Ffid_handler.c;h=537ea6d152d2bc8254a16f6ff1504a79e4ee53e6;hp=fe94281b33f5f7c769c9073f3b9a31e103550c7c;hb=cc6ef11d2f972ebc440013bddda87a536a09750c;hpb=34bdd30ec6a2010dfd98c5110487df210d03815d diff --git a/lustre/fid/fid_handler.c b/lustre/fid/fid_handler.c index fe94281..537ea6d 100644 --- a/lustre/fid/fid_handler.c +++ b/lustre/fid/fid_handler.c @@ -15,11 +15,7 @@ * * You should have received a copy of the GNU General Public License * version 2 along with this program; If not, see - * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf - * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * http://www.gnu.org/licenses/gpl-2.0.html * * GPL HEADER END */ @@ -27,7 +23,7 @@ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2011, 2014, Intel Corporation. + * Copyright (c) 2011, 2015, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -94,13 +90,13 @@ EXPORT_SYMBOL(seq_server_set_cli); * allocate \a w units of sequence from range \a from. */ static inline void range_alloc(struct lu_seq_range *to, - struct lu_seq_range *from, - __u64 width) + struct lu_seq_range *from, + __u64 width) { - width = min(range_space(from), width); - to->lsr_start = from->lsr_start; - to->lsr_end = from->lsr_start + width; - from->lsr_start += width; + width = min(lu_seq_range_space(from), width); + to->lsr_start = from->lsr_start; + to->lsr_end = from->lsr_start + width; + from->lsr_start += width; } /** @@ -118,9 +114,9 @@ static int __seq_server_alloc_super(struct lu_server_seq *seq, int rc; ENTRY; - LASSERT(range_is_sane(space)); + LASSERT(lu_seq_range_is_sane(space)); - if (range_is_exhausted(space)) { + if (lu_seq_range_is_exhausted(space)) { CERROR("%s: Sequences space is exhausted\n", seq->lss_name); RETURN(-ENOSPC); @@ -211,66 +207,77 @@ static int __seq_set_init(const struct lu_env *env, * * when lss_lowater_set reaches the end it is replaced with hiwater one and * a write operation is initiated to allocate new hiwater range. - * if last seq write opearion is still not commited, current operation is + * if last seq write opearion is still not committed, current operation is * flaged as sync write op. */ static int range_alloc_set(const struct lu_env *env, - struct lu_seq_range *out, - struct lu_server_seq *seq) + struct lu_seq_range *out, + struct lu_server_seq *seq) { - struct lu_seq_range *space = &seq->lss_space; - struct lu_seq_range *loset = &seq->lss_lowater_set; - struct lu_seq_range *hiset = &seq->lss_hiwater_set; - int rc = 0; + struct lu_seq_range *space = &seq->lss_space; + struct lu_seq_range *loset = &seq->lss_lowater_set; + struct lu_seq_range *hiset = &seq->lss_hiwater_set; + int rc = 0; - if (range_is_zero(loset)) - __seq_set_init(env, seq); + if (lu_seq_range_is_zero(loset)) + __seq_set_init(env, seq); - if (OBD_FAIL_CHECK(OBD_FAIL_SEQ_ALLOC)) /* exhaust set */ - loset->lsr_start = loset->lsr_end; + if (OBD_FAIL_CHECK(OBD_FAIL_SEQ_ALLOC)) /* exhaust set */ + loset->lsr_start = loset->lsr_end; - if (range_is_exhausted(loset)) { - /* reached high water mark. */ + if (lu_seq_range_is_exhausted(loset)) { + /* reached high water mark. */ struct lu_device *dev = seq->lss_site->ss_lu->ls_top_dev; - int obd_num_clients = dev->ld_obd->obd_num_exports; - __u64 set_sz; + int obd_num_clients = dev->ld_obd->obd_num_exports; + __u64 set_sz; - /* calculate new seq width based on number of clients */ - set_sz = max(seq->lss_set_width, - obd_num_clients * seq->lss_width); - set_sz = min(range_space(space), set_sz); + /* calculate new seq width based on number of clients */ + set_sz = max(seq->lss_set_width, + obd_num_clients * seq->lss_width); + set_sz = min(lu_seq_range_space(space), set_sz); - /* Switch to hiwater range now */ - *loset = *hiset; - /* allocate new hiwater range */ - range_alloc(hiset, space, set_sz); + /* Switch to hiwater range now */ + *loset = *hiset; + /* allocate new hiwater range */ + range_alloc(hiset, space, set_sz); - /* update ondisk seq with new *space */ - rc = seq_store_update(env, seq, NULL, seq->lss_need_sync); - } + /* update ondisk seq with new *space */ + rc = seq_store_update(env, seq, NULL, seq->lss_need_sync); + } - LASSERTF(!range_is_exhausted(loset) || range_is_sane(loset), - DRANGE"\n", PRANGE(loset)); + LASSERTF(!lu_seq_range_is_exhausted(loset) || + lu_seq_range_is_sane(loset), + DRANGE"\n", PRANGE(loset)); - if (rc == 0) - range_alloc(out, loset, seq->lss_width); + if (rc == 0) + range_alloc(out, loset, seq->lss_width); - RETURN(rc); + RETURN(rc); } -static int __seq_server_alloc_meta(struct lu_server_seq *seq, - struct lu_seq_range *out, - const struct lu_env *env) +/** + * Check if the sequence server has sequence avaible + * + * Check if the sequence server has sequence avaible, if not, then + * allocating super sequence from sequence manager (MDT0). + * + * \param[in] env execution environment + * \param[in] seq server sequence + * + * \retval negative errno if allocating new sequence fails + * \retval 0 if there is enough sequence or allocating + * new sequence succeeds + */ +int seq_server_check_and_alloc_super(const struct lu_env *env, + struct lu_server_seq *seq) { struct lu_seq_range *space = &seq->lss_space; int rc = 0; ENTRY; - LASSERT(range_is_sane(space)); - /* Check if available space ends and allocate new super seq */ - if (range_is_exhausted(space)) { + if (lu_seq_range_is_exhausted(space)) { if (!seq->lss_cli) { CERROR("%s: No sequence controller is attached.\n", seq->lss_name); @@ -279,14 +286,14 @@ static int __seq_server_alloc_meta(struct lu_server_seq *seq, rc = seq_client_alloc_super(seq->lss_cli, env); if (rc) { - CERROR("%s: Can't allocate super-sequence, rc %d\n", - seq->lss_name, rc); + CDEBUG(D_HA, "%s: Can't allocate super-sequence:" + " rc %d\n", seq->lss_name, rc); RETURN(rc); } /* Saving new range to allocation space. */ *space = seq->lss_cli->lcs_space; - LASSERT(range_is_sane(space)); + LASSERT(lu_seq_range_is_sane(space)); if (seq->lss_cli->lcs_srv == NULL) { struct lu_server_fld *fld; @@ -298,6 +305,31 @@ static int __seq_server_alloc_meta(struct lu_server_seq *seq, } } + if (lu_seq_range_is_zero(&seq->lss_lowater_set)) + __seq_set_init(env, seq); + + RETURN(rc); +} +EXPORT_SYMBOL(seq_server_check_and_alloc_super); + +static int __seq_server_alloc_meta(struct lu_server_seq *seq, + struct lu_seq_range *out, + const struct lu_env *env) +{ + struct lu_seq_range *space = &seq->lss_space; + int rc = 0; + + ENTRY; + + LASSERT(lu_seq_range_is_sane(space)); + + rc = seq_server_check_and_alloc_super(env, seq); + if (rc < 0) { + CERROR("%s: Allocated super-sequence failed: rc = %d\n", + seq->lss_name, rc); + RETURN(rc); + } + rc = range_alloc_set(env, out, seq); if (rc != 0) { CERROR("%s: Allocated meta-sequence failed: rc = %d\n", @@ -324,6 +356,7 @@ int seq_server_alloc_meta(struct lu_server_seq *seq, RETURN(rc); } +EXPORT_SYMBOL(seq_server_alloc_meta); static int seq_server_handle(struct lu_site *site, const struct lu_env *env, @@ -331,6 +364,7 @@ static int seq_server_handle(struct lu_site *site, { int rc; struct seq_server_site *ss_site; + struct dt_device *dev; ENTRY; ss_site = lu_site2seq(site); @@ -342,6 +376,11 @@ static int seq_server_handle(struct lu_site *site, "initialized\n"); RETURN(-EINVAL); } + + dev = lu2dt_dev(ss_site->ss_server_seq->lss_obj->do_lu.lo_dev); + if (dev->dd_rdonly) + RETURN(-EROFS); + rc = seq_server_alloc_meta(ss_site->ss_server_seq, out, env); break; case SEQ_ALLOC_SUPER: @@ -350,6 +389,11 @@ static int seq_server_handle(struct lu_site *site, "initialized\n"); RETURN(-EINVAL); } + + dev = lu2dt_dev(ss_site->ss_control_seq->lss_obj->do_lu.lo_dev); + if (dev->dd_rdonly) + RETURN(-EROFS); + rc = seq_server_alloc_super(ss_site->ss_control_seq, out, env); break; default: @@ -490,11 +534,11 @@ int seq_server_init(const struct lu_env *env, seq->lss_cli = NULL; seq->lss_type = type; seq->lss_site = ss; - range_init(&seq->lss_space); + lu_seq_range_init(&seq->lss_space); - range_init(&seq->lss_lowater_set); - range_init(&seq->lss_hiwater_set); - seq->lss_set_width = LUSTRE_SEQ_BATCH_WIDTH; + lu_seq_range_init(&seq->lss_lowater_set); + lu_seq_range_init(&seq->lss_hiwater_set); + seq->lss_set_width = LUSTRE_SEQ_BATCH_WIDTH; mutex_init(&seq->lss_mutex); @@ -532,12 +576,12 @@ int seq_server_init(const struct lu_env *env, GOTO(out, rc); } - if (is_srv) { - LASSERT(range_is_sane(&seq->lss_space)); - } else { - LASSERT(!range_is_zero(&seq->lss_space) && - range_is_sane(&seq->lss_space)); - } + if (is_srv) { + LASSERT(lu_seq_range_is_sane(&seq->lss_space)); + } else { + LASSERT(!lu_seq_range_is_zero(&seq->lss_space) && + lu_seq_range_is_sane(&seq->lss_space)); + } rc = seq_server_proc_init(seq); if (rc)