* Use is subject to license terms.
*/
/*
+ * Copyright (c) 2011 Whamcloud, Inc.
+ */
+/*
* This file is part of Lustre, http://www.lustre.org/
* Lustre is a trademark of Sun Microsystems, Inc.
*
CFS_LIST_HEAD(ll_super_blocks);
cfs_spinlock_t ll_sb_lock = CFS_SPIN_LOCK_UNLOCKED;
+#ifndef MS_HAS_NEW_AOPS
extern struct address_space_operations ll_aops;
extern struct address_space_operations ll_dir_aops;
+#else
+extern struct address_space_operations_ext ll_aops;
+extern struct address_space_operations_ext ll_dir_aops;
+#endif
#ifndef log2
#define log2(n) cfs_ffz(~(n))
/* metadata statahead is enabled by default */
sbi->ll_sa_max = LL_SA_RPC_DEF;
- atomic_set(&sbi->ll_sa_total, 0);
- atomic_set(&sbi->ll_sa_wrong, 0);
+ cfs_atomic_set(&sbi->ll_sa_total, 0);
+ cfs_atomic_set(&sbi->ll_sa_wrong, 0);
RETURN(sbi);
}
.d_revalidate = ll_revalidate_nd,
};
-static int client_common_fill_super(struct super_block *sb, char *md, char *dt)
+static int client_common_fill_super(struct super_block *sb, char *md, char *dt,
+ struct vfsmount *mnt)
{
struct inode *root = 0;
struct ll_sb_info *sbi = ll_s2sbi(sb);
struct obd_device *obd;
struct obd_capa *oc = NULL;
- struct obd_statfs osfs;
+ struct obd_statfs *osfs = NULL;
struct ptlrpc_request *request = NULL;
struct obd_connect_data *data = NULL;
struct obd_uuid *uuid;
if (data == NULL)
RETURN(-ENOMEM);
+ OBD_ALLOC_PTR(osfs);
+ if (osfs == NULL) {
+ OBD_FREE_PTR(data);
+ RETURN(-ENOMEM);
+ }
+
if (proc_lustre_fs_root) {
err = lprocfs_register_mountpoint(proc_lustre_fs_root, sb,
dt, md);
/* indicate the features supported by this client */
data->ocd_connect_flags = OBD_CONNECT_IBITS | OBD_CONNECT_NODEVOH |
- OBD_CONNECT_JOIN | OBD_CONNECT_ATTRFID |
- OBD_CONNECT_VERSION | OBD_CONNECT_MDS_CAPA |
- OBD_CONNECT_OSS_CAPA | OBD_CONNECT_CANCELSET|
- OBD_CONNECT_FID | OBD_CONNECT_AT |
- OBD_CONNECT_LOV_V3 | OBD_CONNECT_RMT_CLIENT |
- OBD_CONNECT_VBR | OBD_CONNECT_FULL20;
+ OBD_CONNECT_ATTRFID |
+ OBD_CONNECT_VERSION | OBD_CONNECT_BRW_SIZE |
+ OBD_CONNECT_MDS_CAPA | OBD_CONNECT_OSS_CAPA |
+ OBD_CONNECT_CANCELSET | OBD_CONNECT_FID |
+ OBD_CONNECT_AT | OBD_CONNECT_LOV_V3 |
+ OBD_CONNECT_RMT_CLIENT | OBD_CONNECT_VBR |
+ OBD_CONNECT_FULL20 | OBD_CONNECT_64BITHASH;
if (sbi->ll_flags & LL_SBI_SOM_PREVIEW)
data->ocd_connect_flags |= OBD_CONNECT_SOM;
/* force vfs to use lustre handler for flock() calls - bug 10743 */
sb->s_flags |= MS_FLOCK_LOCK;
#endif
+#ifdef MS_HAS_NEW_AOPS
+ sb->s_flags |= MS_HAS_NEW_AOPS;
+#endif
if (sbi->ll_flags & LL_SBI_FLOCK)
sbi->ll_fop = &ll_file_operations_flock;
if (sbi->ll_flags & LL_SBI_RMT_CLIENT)
data->ocd_connect_flags |= OBD_CONNECT_RMT_CLIENT_FORCE;
+ data->ocd_brw_size = PTLRPC_MAX_BRW_SIZE;
+
err = obd_connect(NULL, &sbi->ll_md_exp, obd, &sbi->ll_sb_uuid, data, NULL);
if (err == -EBUSY) {
LCONSOLE_ERROR_MSG(0x14f, "An MDT (md %s) is performing "
GOTO(out_md, err);
}
- err = obd_statfs(obd, &osfs,
+ err = obd_statfs(obd, osfs,
cfs_time_shift_64(-OBD_STATFS_CACHE_SECONDS), 0);
if (err)
GOTO(out_md_fid, err);
+ /* This needs to be after statfs to ensure connect has finished.
+ * Note that "data" does NOT contain the valid connect reply.
+ * If connecting to a 1.8 server there will be no LMV device, so
+ * we can access the MDC export directly and exp_connect_flags will
+ * be non-zero, but if accessing an upgraded 2.1 server it will
+ * have the correct flags filled in.
+ * XXX: fill in the LMV exp_connect_flags from MDC(s). */
+ valid = sbi->ll_md_exp->exp_connect_flags & CLIENT_CONNECT_MDT_REQD;
+ if (sbi->ll_md_exp->exp_connect_flags != 0 &&
+ valid != CLIENT_CONNECT_MDT_REQD) {
+ char *buf;
+
+ OBD_ALLOC_WAIT(buf, CFS_PAGE_SIZE);
+ obd_connect_flags2str(buf, CFS_PAGE_SIZE,
+ valid ^ CLIENT_CONNECT_MDT_REQD, ",");
+ LCONSOLE_ERROR_MSG(0x170, "Server %s does not support "
+ "feature(s) needed for correct operation "
+ "of this client (%s). Please upgrade "
+ "server or downgrade client.\n",
+ sbi->ll_md_exp->exp_obd->obd_name, buf);
+ OBD_FREE(buf, CFS_PAGE_SIZE);
+ GOTO(out_md, err = -EPROTO);
+ }
+
size = sizeof(*data);
err = obd_get_info(sbi->ll_md_exp, sizeof(KEY_CONN_DATA),
KEY_CONN_DATA, &size, data, NULL);
GOTO(out_md, err);
}
- LASSERT(osfs.os_bsize);
- sb->s_blocksize = osfs.os_bsize;
- sb->s_blocksize_bits = log2(osfs.os_bsize);
+ LASSERT(osfs->os_bsize);
+ sb->s_blocksize = osfs->os_bsize;
+ sb->s_blocksize_bits = log2(osfs->os_bsize);
sb->s_magic = LL_SUPER_MAGIC;
/* for bug 11559. in $LINUX/fs/read_write.c, function do_sendfile():
#else
sb->s_maxbytes = PAGE_CACHE_MAXBYTES;
#endif
- sbi->ll_namelen = osfs.os_namelen;
+ sbi->ll_namelen = osfs->os_namelen;
sbi->ll_max_rw_chunk = LL_DEFAULT_MAX_RW_CHUNK;
if ((sbi->ll_flags & LL_SBI_USER_XATTR) &&
sbi->ll_flags |= LL_SBI_OSS_CAPA;
}
+ if (data->ocd_connect_flags & OBD_CONNECT_64BITHASH)
+ sbi->ll_flags |= LL_SBI_64BIT_HASH;
+
+ if (data->ocd_connect_flags & OBD_CONNECT_BRW_SIZE)
+ sbi->ll_md_brw_size = data->ocd_brw_size;
+ else
+ sbi->ll_md_brw_size = CFS_PAGE_SIZE;
+
obd = class_name2obd(dt);
if (!obd) {
CERROR("DT %s: not setup or attached\n", dt);
OBD_CONNECT_SRVLOCK | OBD_CONNECT_TRUNCLOCK|
OBD_CONNECT_AT | OBD_CONNECT_RMT_CLIENT |
OBD_CONNECT_OSS_CAPA | OBD_CONNECT_VBR|
- OBD_CONNECT_FULL20;
+ OBD_CONNECT_FULL20 | OBD_CONNECT_64BITHASH |
+ OBD_CONNECT_MAXBYTES;
if (sbi->ll_flags & LL_SBI_SOM_PREVIEW)
data->ocd_connect_flags |= OBD_CONNECT_SOM;
if (OBD_FAIL_CHECK(OBD_FAIL_OSC_CKSUM_ADLER_ONLY))
data->ocd_cksum_types = OBD_CKSUM_ADLER;
else
- /* send the list of supported checksum types */
- data->ocd_cksum_types = OBD_CKSUM_ALL;
+ data->ocd_cksum_types = cksum_types_supported();
}
#ifdef HAVE_LRU_RESIZE_SUPPORT
obd->obd_upcall.onu_owner = &sbi->ll_lco;
obd->obd_upcall.onu_upcall = cl_ocd_update;
- data->ocd_brw_size = PTLRPC_MAX_BRW_PAGES << CFS_PAGE_SHIFT;
+
+ data->ocd_brw_size = PTLRPC_MAX_BRW_SIZE;
err = obd_connect(NULL, &sbi->ll_dt_exp, obd, &sbi->ll_sb_uuid, data, NULL);
if (err == -EBUSY) {
valid |= OBD_MD_FLACL;
OBD_ALLOC_PTR(op_data);
- if (op_data == NULL)
+ if (op_data == NULL)
GOTO(out_lock_cn_cb, err = -ENOMEM);
op_data->op_fid1 = sbi->ll_root_fid;
CERROR("md_getattr failed for root: rc = %d\n", err);
GOTO(out_lock_cn_cb, err);
}
- memset(&lmd, 0, sizeof(lmd));
err = md_get_lustre_md(sbi->ll_md_exp, request, sbi->ll_dt_exp,
sbi->ll_md_exp, &lmd);
if (err) {
}
LASSERT(fid_is_sane(&sbi->ll_root_fid));
- root = ll_iget(sb, cl_fid_build_ino(&sbi->ll_root_fid), &lmd);
+ root = ll_iget(sb, cl_fid_build_ino(&sbi->ll_root_fid, 0), &lmd);
md_free_lustre_md(sbi->ll_md_exp, &lmd);
ptlrpc_req_finished(request);
cl_sb_init(sb);
sb->s_root = d_alloc_root(root);
- if (data != NULL)
- OBD_FREE(data, sizeof(*data));
-
sb->s_root->d_op = &ll_d_root_ops;
sbi->ll_sdev_orig = sb->s_dev;
uuid = obd_get_uuid(sbi->ll_md_exp);
if (uuid != NULL)
sb->s_dev = get_uuid2int(uuid->uuid, strlen(uuid->uuid));
+ sbi->ll_mnt = mnt;
+
+ if (data != NULL)
+ OBD_FREE_PTR(data);
+ if (osfs != NULL)
+ OBD_FREE_PTR(osfs);
RETURN(err);
out_root:
out:
if (data != NULL)
OBD_FREE_PTR(data);
+ if (osfs != NULL)
+ OBD_FREE_PTR(osfs);
lprocfs_unregister_mountpoint(sbi);
return err;
}
cfs_sema_init(&lli->lli_rmtperm_sem, 1);
CFS_INIT_LIST_HEAD(&lli->lli_oss_capas);
cfs_spin_lock_init(&lli->lli_sa_lock);
+ lli->lli_clob = NULL;
+ cfs_sema_init(&lli->lli_readdir_sem, 1);
+ fid_zero(&lli->lli_pfid);
}
-#ifdef HAVE_NEW_BACKING_DEV_INFO
-static atomic_t ll_bdi_num = ATOMIC_INIT(0);
+static inline int ll_bdi_register(struct backing_dev_info *bdi)
+{
+#ifdef HAVE_BDI_REGISTER
+ static atomic_t ll_bdi_num = ATOMIC_INIT(0);
+
+#ifdef HAVE_BDI_NAME
+ bdi->name = "lustre";
+#endif
+ return bdi_register(bdi, NULL, "lustre-%d",
+ atomic_inc_return(&ll_bdi_num));
+#else
+ return 0;
#endif
+}
-int ll_fill_super(struct super_block *sb)
+int ll_fill_super(struct super_block *sb, struct vfsmount *mnt)
{
- struct lustre_profile *lprof;
+ struct lustre_profile *lprof = NULL;
struct lustre_sb_info *lsi = s2lsi(sb);
struct ll_sb_info *sbi;
char *dt = NULL, *md = NULL;
char *profilenm = get_profile_name(sb);
- struct config_llog_instance cfg = {0, };
- char ll_instance[sizeof(sb) * 2 + 1];
+ struct config_llog_instance *cfg;
+ /* %p for void* in printf needs 16+2 characters: 0xffffffffffffffff */
+ const int instlen = sizeof(cfg->cfg_instance) * 2 + 2;
int err;
ENTRY;
CDEBUG(D_VFSTRACE, "VFS Op: sb %p\n", sb);
+ OBD_ALLOC_PTR(cfg);
+ if (cfg == NULL)
+ RETURN(-ENOMEM);
+
cfs_module_get();
/* client additional sb info */
lsi->lsi_llsbi = sbi = ll_init_sbi();
if (!sbi) {
cfs_module_put(THIS_MODULE);
+ OBD_FREE_PTR(cfg);
RETURN(-ENOMEM);
}
if (err)
GOTO(out_free, err);
- err = ll_bdi_init(&lsi->bdi);
+ err = ll_bdi_init(&lsi->lsi_bdi);
+ if (err)
+ GOTO(out_free, err);
+ lsi->lsi_flags |= LSI_BDI_INITIALIZED;
+ lsi->lsi_bdi.capabilities = BDI_CAP_MAP_COPY;
+ err = ll_bdi_register(&lsi->lsi_bdi);
if (err)
GOTO(out_free, err);
-#ifdef HAVE_NEW_BACKING_DEV_INFO
- lsi->bdi.name = "lustre";
- lsi->bdi.capabilities = BDI_CAP_MAP_COPY;
- err = bdi_register(&lsi->bdi, NULL, "lustre-%d",
- atomic_inc_return(&ll_bdi_num));
- sb->s_bdi = &lsi->bdi;
+#ifdef HAVE_SB_BDI
+ sb->s_bdi = &lsi->lsi_bdi;
#endif
/* Generate a string unique to this super, in case some joker tries
to mount the same fs at two mount points.
Use the address of the super itself.*/
- sprintf(ll_instance, "%p", sb);
- cfg.cfg_instance = ll_instance;
- cfg.cfg_uuid = lsi->lsi_llsbi->ll_sb_uuid;
+ cfg->cfg_instance = sb;
+ cfg->cfg_uuid = lsi->lsi_llsbi->ll_sb_uuid;
/* set up client obds */
- err = lustre_process_log(sb, profilenm, &cfg);
+ err = lustre_process_log(sb, profilenm, cfg);
if (err < 0) {
CERROR("Unable to process log: %d\n", err);
GOTO(out_free, err);
CDEBUG(D_CONFIG, "Found profile %s: mdc=%s osc=%s\n", profilenm,
lprof->lp_md, lprof->lp_dt);
- OBD_ALLOC(dt, strlen(lprof->lp_dt) +
- strlen(ll_instance) + 2);
+ OBD_ALLOC(dt, strlen(lprof->lp_dt) + instlen + 2);
if (!dt)
GOTO(out_free, err = -ENOMEM);
- sprintf(dt, "%s-%s", lprof->lp_dt, ll_instance);
+ sprintf(dt, "%s-%p", lprof->lp_dt, cfg->cfg_instance);
- OBD_ALLOC(md, strlen(lprof->lp_md) +
- strlen(ll_instance) + 2);
+ OBD_ALLOC(md, strlen(lprof->lp_md) + instlen + 2);
if (!md)
GOTO(out_free, err = -ENOMEM);
- sprintf(md, "%s-%s", lprof->lp_md, ll_instance);
+ sprintf(md, "%s-%p", lprof->lp_md, cfg->cfg_instance);
/* connections, registrations, sb setup */
- err = client_common_fill_super(sb, md, dt);
+ err = client_common_fill_super(sb, md, dt, mnt);
out_free:
if (md)
- OBD_FREE(md, strlen(md) + 1);
+ OBD_FREE(md, strlen(lprof->lp_md) + instlen + 2);
if (dt)
- OBD_FREE(dt, strlen(dt) + 1);
+ OBD_FREE(dt, strlen(lprof->lp_dt) + instlen + 2);
if (err)
ll_put_super(sb);
else
LCONSOLE_WARN("Client %s has started\n", profilenm);
+ OBD_FREE_PTR(cfg);
RETURN(err);
} /* ll_fill_super */
void ll_put_super(struct super_block *sb)
{
struct config_llog_instance cfg;
- char ll_instance[sizeof(sb) * 2 + 1];
struct obd_device *obd;
struct lustre_sb_info *lsi = s2lsi(sb);
struct ll_sb_info *sbi = ll_s2sbi(sb);
ll_print_capa_stat(sbi);
- sprintf(ll_instance, "%p", sb);
- cfg.cfg_instance = ll_instance;
- lustre_end_log(sb, NULL, &cfg);
+ cfg.cfg_instance = sb;
+ lustre_end_log(sb, profilenm, &cfg);
if (sbi->ll_md_exp) {
obd = class_exp2obd(sbi->ll_md_exp);
if (profilenm)
class_del_profile(profilenm);
- if (ll_bdi_wb_cnt(lsi->bdi) > 0)
- ll_bdi_destroy(&lsi->bdi);
+ if (lsi->lsi_flags & LSI_BDI_INITIALIZED) {
+ ll_bdi_destroy(&lsi->lsi_bdi);
+ lsi->lsi_flags &= ~LSI_BDI_INITIALIZED;
+ }
ll_free_sbi(sb);
lsi->lsi_llsbi = NULL;
cl_env_cache_purge(~0);
- LCONSOLE_WARN("client %s umount complete\n", ll_instance);
+ LCONSOLE_WARN("client %p umount complete\n", cfg.cfg_instance);
cfs_module_put(THIS_MODULE);
int ll_setattr(struct dentry *de, struct iattr *attr)
{
+ int mode = de->d_inode->i_mode;
+
if ((attr->ia_valid & (ATTR_CTIME|ATTR_SIZE|ATTR_MODE)) ==
- (ATTR_CTIME|ATTR_SIZE|ATTR_MODE))
+ (ATTR_CTIME|ATTR_SIZE|ATTR_MODE))
attr->ia_valid |= MDS_OPEN_OWNEROVERRIDE;
- if ((de->d_inode->i_mode & S_ISUID) &&
+ if (((attr->ia_valid & (ATTR_MODE|ATTR_FORCE|ATTR_SIZE)) ==
+ (ATTR_SIZE|ATTR_MODE)) &&
+ (((mode & S_ISUID) && !(attr->ia_mode & S_ISUID)) ||
+ (((mode & (S_ISGID|S_IXGRP)) == (S_ISGID|S_IXGRP)) &&
+ !(attr->ia_mode & S_ISGID))))
+ attr->ia_valid |= ATTR_FORCE;
+
+ if ((mode & S_ISUID) &&
!(attr->ia_mode & S_ISUID) &&
!(attr->ia_valid & ATTR_KILL_SUID))
attr->ia_valid |= ATTR_KILL_SUID;
- if (((de->d_inode->i_mode & (S_ISGID|S_IXGRP)) == (S_ISGID|S_IXGRP)) &&
+ if (((mode & (S_ISGID|S_IXGRP)) == (S_ISGID|S_IXGRP)) &&
!(attr->ia_mode & S_ISGID) &&
!(attr->ia_valid & ATTR_KILL_SGID))
attr->ia_valid |= ATTR_KILL_SGID;
* but lov raid0 is not setup yet and parallel e.g.
* glimpse would try to use uninitialized lov */
cl_inode_init(inode, md);
+ cfs_spin_lock(&lli->lli_lock);
lli->lli_smd = lsm;
+ cfs_spin_unlock(&lli->lli_lock);
cfs_up(&lli->lli_och_sem);
lli->lli_maxbytes = lsm->lsm_maxbytes;
if (lli->lli_maxbytes > PAGE_CACHE_MAXBYTES)
cfs_spin_unlock(&lli->lli_lock);
}
#endif
- inode->i_ino = cl_fid_build_ino(&body->fid1);
+ inode->i_ino = cl_fid_build_ino(&body->fid1, 0);
inode->i_generation = cl_fid_build_gen(&body->fid1);
if (body->valid & OBD_MD_FLATIME) {
struct ll_inode_info *lli = ll_i2info(inode);
ENTRY;
- CDEBUG(D_VFSTRACE, "VFS Op:inode=%lu/%u(%p)\n",
- inode->i_ino, inode->i_generation, inode);
+ CDEBUG(D_VFSTRACE, "VFS Op:inode="DFID"(%p)\n",
+ PFID(&lli->lli_fid), inode);
ll_lli_init(lli);
/* OIDEBUG(inode); */
/* initializing backing dev info. */
- inode->i_mapping->backing_dev_info = &(s2lsi(inode->i_sb)->bdi);
+ inode->i_mapping->backing_dev_info = &s2lsi(inode->i_sb)->lsi_bdi;
if (S_ISREG(inode->i_mode)) {
struct ll_sb_info *sbi = ll_i2sbi(inode);
inode->i_op = &ll_file_inode_operations;
inode->i_fop = sbi->ll_fop;
- inode->i_mapping->a_ops = &ll_aops;
+ inode->i_mapping->a_ops = (struct address_space_operations *)&ll_aops;
EXIT;
} else if (S_ISDIR(inode->i_mode)) {
inode->i_op = &ll_dir_inode_operations;
inode->i_fop = &ll_dir_operations;
- inode->i_mapping->a_ops = &ll_dir_aops;
+ inode->i_mapping->a_ops = (struct address_space_operations *)&ll_dir_aops;
EXIT;
} else if (S_ISLNK(inode->i_mode)) {
inode->i_op = &ll_fast_symlink_inode_operations;
ENTRY;
rc = obd_fid_delete(sbi->ll_md_exp, ll_inode2fid(inode));
- if (rc) {
+ if (rc)
CERROR("fid_delete() failed, rc %d\n", rc);
- }
+
truncate_inode_pages(&inode->i_data, 0);
+
+ /* Workaround for LU-118 */
+ if (inode->i_data.nrpages) {
+ TREE_READ_LOCK_IRQ(&inode->i_data);
+ TREE_READ_UNLOCK_IRQ(&inode->i_data);
+ LASSERTF(inode->i_data.nrpages == 0,
+ "inode=%lu/%u(%p) nrpages=%lu, see "
+ "http://jira.whamcloud.com/browse/LU-118\n",
+ inode->i_ino, inode->i_generation, inode,
+ inode->i_data.nrpages);
+ }
+ /* Workaround end */
+
clear_inode(inode);
EXIT;
op_data = ll_prep_md_op_data(NULL, inode, NULL, NULL,
0, 0, LUSTRE_OPC_ANY,
NULL);
- if (op_data == NULL)
- RETURN(-ENOMEM);
+ if (IS_ERR(op_data))
+ RETURN(PTR_ERR(op_data));
op_data->op_valid = OBD_MD_FLFLAGS;
rc = md_getattr(sbi->ll_md_exp, op_data, &req);
LASSERT(*inode || sb);
sbi = sb ? ll_s2sbi(sb) : ll_i2sbi(*inode);
- memset(&md, 0, sizeof(struct lustre_md));
-
rc = md_get_lustre_md(sbi->ll_md_exp, req, sbi->ll_dt_exp,
sbi->ll_md_exp, &md);
if (rc)
*/
LASSERT(fid_is_sane(&md.body->fid1));
- *inode = ll_iget(sb, cl_fid_build_ino(&md.body->fid1), &md);
+ *inode = ll_iget(sb, cl_fid_build_ino(&md.body->fid1, 0), &md);
if (*inode == NULL || IS_ERR(*inode)) {
if (md.lsm)
obd_free_memmd(sbi->ll_dt_exp, &md.lsm);
op_data->op_mds = 0;
op_data->op_data = data;
+ /* If the file is being opened after mknod() (normally due to NFS)
+ * try to use the default stripe data from parent directory for
+ * allocating OST objects. Try to pass the parent FID to MDS. */
+ if (opc == LUSTRE_OPC_CREATE && i1 == i2 && S_ISREG(i2->i_mode) &&
+ ll_i2info(i2)->lli_smd == NULL) {
+ struct ll_inode_info *lli = ll_i2info(i2);
+
+ cfs_spin_lock(&lli->lli_lock);
+ if (likely(lli->lli_smd == NULL &&
+ !fid_is_zero(&lli->lli_pfid)))
+ op_data->op_fid1 = lli->lli_pfid;
+ cfs_spin_unlock(&lli->lli_lock);
+ /** We ignore parent's capability temporary. */
+ }
+
return op_data;
}
git://git.whamcloud.com / fs / lustre-release.git / blobdiff