/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
* vim:expandtab:shiftwidth=8:tabstop=8:
*
- * lustre/lib/fsfilt_ext3.c
- * Lustre filesystem abstraction routines
+ * GPL HEADER START
*
- * Copyright (C) 2002, 2003 Cluster File Systems, Inc.
- * Author: Andreas Dilger <adilger@clusterfs.com>
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * This file is part of Lustre, http://www.lustre.org.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 only,
+ * as published by the Free Software Foundation.
*
- * Lustre is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License version 2 for more details (a copy is included
+ * in the LICENSE file that accompanied this code).
*
- * Lustre is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * 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
*
- * You should have received a copy of the GNU General Public License
- * along with Lustre; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * 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.
+ *
+ * GPL HEADER END
+ */
+/*
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved
+ * Use is subject to license terms.
+ */
+/*
+ * This file is part of Lustre, http://www.lustre.org/
+ * Lustre is a trademark of Sun Microsystems, Inc.
+ *
+ * lustre/lvfs/fsfilt_ext3.c
+ *
+ * Author: Andreas Dilger <adilger@clusterfs.com>
*/
#define DEBUG_SUBSYSTEM S_FILTER
#include <linux/init.h>
#include <linux/module.h>
#include <linux/fs.h>
-#include <linux/jbd.h>
#include <linux/slab.h>
#include <linux/pagemap.h>
#include <linux/quotaops.h>
+#ifdef HAVE_EXT4_LDISKFS
+#include <ext4/ext4.h>
+#include <ext4/ext4_jbd2.h>
+#else
+#include <linux/jbd.h>
#include <linux/ext3_fs.h>
#include <linux/ext3_jbd.h>
+#endif
#include <linux/version.h>
#include <linux/bitops.h>
#include <linux/quota.h>
#include <linux/quotaio_v1.h>
#include <linux/quotaio_v2.h>
+#if defined(HAVE_EXT3_XATTR_H)
#include <ext3/xattr.h>
+#else
+/* ext3 xattr.h not available in rh style kernel-devel rpm */
+extern int ext3_xattr_get(struct inode *, int, const char *, void *, size_t);
+extern int ext3_xattr_set_handle(handle_t *, struct inode *, int, const char *, const void *, size_t, int);
+#endif
-#include <libcfs/kp30.h>
+#include <libcfs/libcfs.h>
#include <lustre_fsfilt.h>
#include <obd.h>
#include <lustre_quota.h>
#include <linux/lprocfs_status.h>
#ifdef EXT3_MULTIBLOCK_ALLOCATOR
+#ifdef HAVE_EXT4_LDISKFS
+#include <ext4/ext4_extents.h>
+#else
#include <linux/ext3_extents.h>
#endif
+#endif
+
+#include "lustre_quota_fmt.h"
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15)
#define FSFILT_DATA_TRANS_BLOCKS(sb) EXT3_DATA_TRANS_BLOCKS
#define FSFILT_SINGLEDATA_TRANS_BLOCKS(sb) EXT3_SINGLEDATA_TRANS_BLOCKS
#endif
-#define fsfilt_ext3_journal_start(inode, nblocks) ext3_journal_start(inode, nblocks)
-#define fsfilt_ext3_journal_stop(handle) ext3_journal_stop(handle)
-
static cfs_mem_cache_t *fcb_cache;
struct fsfilt_cb_data {
#define EXT3_XATTR_INDEX_TRUSTED 4
#endif
+#ifdef HAVE_EXT4_LDISKFS
+#define fsfilt_log_start_commit(journal, tid) jbd2_log_start_commit(journal, tid)
+#define fsfilt_log_wait_commit(journal, tid) jbd2_log_wait_commit(journal, tid)
+#define fsfilt_journal_callback_set(handle, func, jcb) jbd2_journal_callback_set(handle, func, jcb)
+#else
+#define fsfilt_log_start_commit(journal, tid) log_start_commit(journal, tid)
+#define fsfilt_log_wait_commit(journal, tid) log_wait_commit(journal, tid)
+#define fsfilt_journal_callback_set(handle, func, jcb) journal_callback_set(handle, func, jcb)
+#define ext_pblock(ex) le32_to_cpu((ex)->ee_start)
+#define ext3_ext_store_pblock(ex, pblock) ((ex)->ee_start = cpu_to_le32(pblock))
+#define ext3_inode_bitmap(sb,desc) le32_to_cpu((desc)->bg_inode_bitmap)
+#endif
+
static char *fsfilt_ext3_get_label(struct super_block *sb)
{
return EXT3_SB(sb)->s_es->s_volume_name;
int err;
journal = EXT3_SB(sb)->s_journal;
- handle = journal_start(journal, 1);
+ handle = ext3_journal_start_sb(sb, 1);
if (IS_ERR(handle)) {
CERROR("can't start transaction\n");
return(PTR_ERR(handle));
err = ext3_journal_dirty_metadata(handle, EXT3_SB(sb)->s_sbh);
out:
- journal_stop(handle);
+ ext3_journal_stop(handle);
return(err);
}
}
#ifdef HAVE_DISK_INODE_VERSION
+
+static __u64 get_i_version(struct inode *inode)
+{
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)) && defined(HAVE_EXT4_LDISKFS)
+ return inode->i_version;
+#else
+ return EXT3_I(inode)->i_fs_version;
+#endif
+}
+
+static void set_i_version(struct inode *inode, __u64 new_version)
+{
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)) && defined(HAVE_EXT4_LDISKFS)
+ inode->i_version = new_version;
+#else
+ (EXT3_I(inode))->i_fs_version = new_version;
+#endif
+}
+
/*
* Get the 64-bit version for an inode.
*/
static __u64 fsfilt_ext3_get_version(struct inode *inode)
{
- return EXT3_I(inode)->i_fs_version;
+ CDEBUG(D_INFO, "Get version "LPX64" for inode %lu\n",
+ get_i_version(inode), inode->i_ino);
+ return get_i_version(inode);
}
/*
*/
static __u64 fsfilt_ext3_set_version(struct inode *inode, __u64 new_version)
{
- __u64 old_version = EXT3_I(inode)->i_fs_version;
-
- (EXT3_I(inode))->i_fs_version = new_version;
+ __u64 old_version = get_i_version(inode);
+
+ CDEBUG(D_INFO, "Set version "LPX64" (old "LPX64") for inode %lu\n",
+ new_version, old_version, inode->i_ino);
+ set_i_version(inode, new_version);
+ /* version is set after all inode operations are finished, so we should
+ * mark it dirty here */
+ inode->i_sb->s_op->dirty_inode(inode);
return old_version;
}
nblocks += 3;
/* no break */
case FSFILT_OP_CREATE: {
-#if defined(EXT3_EXTENTS_FL) && defined(EXT3_INDEX_FL)
+#if defined(EXT3_EXTENTS_FL) && defined(EXT3_INDEX_FL) && !defined(HAVE_EXT4_LDISKFS)
static int warned;
if (!warned) {
if (!test_opt(inode->i_sb, EXTENTS)) {
} else if (((EXT3_I(inode)->i_flags &
cpu_to_le32(EXT3_EXTENTS_FL | EXT3_INDEX_FL)) ==
cpu_to_le32(EXT3_EXTENTS_FL | EXT3_INDEX_FL))) {
- CWARN("extent-mapped directory found - contact "
- "CFS: support@clusterfs.com\n");
+ CWARN("extent-mapped directory found with "
+ "ext3-based ldiskfs - contact "
+ "http://bugzilla.lustre.org/\n");
warned = 1;
}
}
journal_start:
LASSERTF(nblocks > 0, "can't start %d credit transaction\n", nblocks);
- handle = fsfilt_ext3_journal_start(inode, nblocks);
+ handle = ext3_journal_start(inode, nblocks);
if (!IS_ERR(handle))
LASSERT(current->journal_info == handle);
* quota file that is active. This is at least true for now.
*/
needed += hweight32(sb_any_quota_enabled(sb)) *
- FSFILT_SINGLEDATA_TRANS_BLOCKS(inode->i_sb);
+ FSFILT_SINGLEDATA_TRANS_BLOCKS(sb);
#endif
return needed;
}
LASSERTF(needed > 0, "can't start %d credit transaction\n", needed);
- handle = fsfilt_ext3_journal_start(fso->fso_dentry->d_inode, needed);
+ handle = ext3_journal_start(fso->fso_dentry->d_inode, needed);
if (IS_ERR(handle)) {
CERROR("can't get handle for %d credits: rc = %ld\n", needed,
PTR_ERR(handle));
if (handle->h_buffer_credits > nblocks)
return 0;
- if (journal_extend(handle, nblocks) == 0)
+ if (ext3_journal_extend(handle, nblocks) == 0)
return 0;
ext3_mark_inode_dirty(handle, inode);
- return journal_restart(handle, nblocks);
+ return ext3_journal_restart(handle, nblocks);
}
static int fsfilt_ext3_commit(struct inode *inode, void *h, int force_sync)
if (force_sync)
handle->h_sync = 1; /* recovery likes this */
- rc = fsfilt_ext3_journal_stop(handle);
+ rc = ext3_journal_stop(handle);
return rc;
}
tid = transaction->t_tid;
/* we don't want to be blocked */
handle->h_sync = 0;
- rc = fsfilt_ext3_journal_stop(handle);
+ rc = ext3_journal_stop(handle);
if (rc) {
CERROR("error while stopping transaction: %d\n", rc);
return rc;
}
- log_start_commit(journal, tid);
+ fsfilt_log_start_commit(journal, tid);
*wait_handle = (void *) tid;
CDEBUG(D_INODE, "commit async: %lu\n", (unsigned long) tid);
if (unlikely(is_journal_aborted(journal)))
return -EIO;
- log_wait_commit(EXT3_JOURNAL(inode), tid);
+ fsfilt_log_wait_commit(EXT3_JOURNAL(inode), tid);
if (unlikely(is_journal_aborted(journal)))
return -EIO;
struct inode *inode = dentry->d_inode;
int rc = 0;
- lock_24kernel();
-
/* Avoid marking the inode dirty on the superblock list unnecessarily.
* We are already writing the inode to disk as part of this
* transaction and want to avoid a lot of extra inode writeout
if (iattr->ia_valid & ATTR_MODE) {
inode->i_mode = iattr->ia_mode;
- if (!in_group_p(inode->i_gid) && !capable(CAP_FSETID))
+ if (!in_group_p(inode->i_gid) &&
+ !cfs_capable(CFS_CAP_FSETID))
inode->i_mode &= ~S_ISGID;
}
}
out:
- unlock_24kernel();
RETURN(rc);
}
-static int fsfilt_ext3_iocontrol(struct inode * inode, struct file *file,
+static int fsfilt_ext3_iocontrol(struct inode *inode, struct file *file,
unsigned int cmd, unsigned long arg)
{
int rc = 0;
RETURN(-EPERM);
}
+#ifdef HAVE_EXT4_LDISKFS
+ /* ext4_ioctl does not have a inode argument */
+ if (inode->i_fop->unlocked_ioctl)
+ rc = inode->i_fop->unlocked_ioctl(file, cmd, arg);
+#else
if (inode->i_fop->ioctl)
rc = inode->i_fop->ioctl(inode, file, cmd, arg);
+#endif
else
RETURN(-ENOTTY);
LASSERT(TRYLOCK_INODE_MUTEX(inode) == 0);
rc = ext3_xattr_set_handle(handle, inode, EXT3_XATTR_INDEX_TRUSTED,
- name, lmm, lmm_size, 0);
+ name, lmm, lmm_size, XATTR_NO_CTIME);
if (rc && rc != -EROFS)
const int blkbits = inode->i_sb->s_blocksize_bits;
const int blksize = inode->i_sb->s_blocksize;
- CDEBUG(D_EXT2, "reading "LPSZ" at dir %lu+%llu\n",
- count, inode->i_ino, *off);
+ CDEBUG(D_EXT2, "reading %lu at dir %lu+%llu\n",
+ (unsigned long)count, inode->i_ino, *off);
while (count > 0) {
struct buffer_head *bh;
{
struct fsfilt_cb_data *fcb;
- OBD_SLAB_ALLOC(fcb, fcb_cache, CFS_ALLOC_IO, sizeof *fcb);
+ OBD_SLAB_ALLOC_PTR_GFP(fcb, fcb_cache, CFS_ALLOC_IO);
if (fcb == NULL)
RETURN(-ENOMEM);
fcb->cb_data = cb_data;
CDEBUG(D_EXT2, "set callback for last_rcvd: "LPD64"\n", last_rcvd);
- journal_callback_set(handle, fsfilt_ext3_cb_func,
- (struct journal_callback *)fcb);
+ fsfilt_journal_callback_set(handle, fsfilt_ext3_cb_func,
+ (struct journal_callback *)fcb);
return 0;
}
int rc;
memset(&sfs, 0, sizeof(sfs));
-
rc = ll_do_statfs(sb, &sfs);
-
if (!rc && sfs.f_bfree < sfs.f_ffree) {
sfs.f_files = (sfs.f_files - sfs.f_ffree) + sfs.f_bfree;
sfs.f_ffree = sfs.f_bfree;
#ifdef EXT3_MULTIBLOCK_ALLOCATOR
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,17))
-#define ext3_up_truncate_sem(inode) up(&EXT3_I(inode)->truncate_sem);
-#define ext3_down_truncate_sem(inode) down(&EXT3_I(inode)->truncate_sem);
+#define fsfilt_up_truncate_sem(inode) up(&EXT3_I(inode)->truncate_sem);
+#define fsfilt_down_truncate_sem(inode) down(&EXT3_I(inode)->truncate_sem);
+#else
+#ifdef HAVE_EXT4_LDISKFS
+#define fsfilt_up_truncate_sem(inode) up_write((&EXT4_I(inode)->i_data_sem));
+#define fsfilt_down_truncate_sem(inode) down_write((&EXT4_I(inode)->i_data_sem));
#else
-#define ext3_up_truncate_sem(inode) mutex_unlock(&EXT3_I(inode)->truncate_mutex);
-#define ext3_down_truncate_sem(inode) mutex_lock(&EXT3_I(inode)->truncate_mutex);
+#define fsfilt_up_truncate_sem(inode) mutex_unlock(&EXT3_I(inode)->truncate_mutex);
+#define fsfilt_down_truncate_sem(inode) mutex_lock(&EXT3_I(inode)->truncate_mutex);
+#endif
#endif
#ifndef EXT_ASSERT
#ifdef EXT3_EXT_HAS_NO_TREE
/* for kernels 2.6.18 and later */
+#ifdef HAVE_EXT4_LDISKFS
+#define EXT_GENERATION(inode) (EXT4_I(inode)->i_ext_generation)
+#else
+#define EXT_GENERATION(inode) ext_generation(inode)
+#endif
#define ext3_ext_base inode
#define ext3_ext_base2inode(inode) (inode)
#define EXT_DEPTH(inode) ext_depth(inode)
-#define EXT_GENERATION(inode) ext_generation(inode)
#define fsfilt_ext3_ext_walk_space(inode, block, num, cb, cbdata) \
ext3_ext_walk_space(inode, block, num, cb, cbdata);
#else
#endif
#include <linux/lustre_version.h>
-#if EXT3_EXT_MAGIC == 0xf301
-#define ee_start e_start
-#define ee_block e_block
-#define ee_len e_num
-#endif
-#ifndef EXT3_BB_MAX_BLOCKS
-#define ext3_mb_new_blocks(handle, inode, goal, count, aflags, err) \
- ext3_new_blocks(handle, inode, count, goal, err)
-#endif
struct bpointers {
unsigned long *blocks;
int create;
};
-static int ext3_ext_find_goal(struct inode *inode, struct ext3_ext_path *path,
- unsigned long block, int *aflags)
+static long ext3_ext_find_goal(struct inode *inode, struct ext3_ext_path *path,
+ unsigned long block, int *aflags)
{
struct ext3_inode_info *ei = EXT3_I(inode);
unsigned long bg_start;
depth = path->p_depth;
/* try to predict block placement */
- if ((ex = path[depth].p_ext)) {
-#if 0
- /* This prefers to eat into a contiguous extent
- * rather than find an extent that the whole
- * request will fit into. This can fragment data
- * block allocation and prevents our lovely 1M I/Os
- * from reaching the disk intact. */
- if (ex->ee_block + ex->ee_len == block)
- *aflags |= 1;
-#endif
- return ex->ee_start + (block - ex->ee_block);
- }
+ if ((ex = path[depth].p_ext))
+ return ext_pblock(ex) + (block - le32_to_cpu(ex->ee_block));
/* it looks index is empty
* try to find starting from index itself */
pblock = ext3_mb_new_blocks(handle, &ar, err);
*count = ar.len;
return pblock;
-
}
#endif
static int ext3_ext_new_extent_cb(struct ext3_ext_base *base,
struct ext3_ext_path *path,
struct ext3_ext_cache *cex,
+#ifdef HAVE_EXT_PREPARE_CB_EXTENT
+ struct ext3_extent *ex,
+#endif
void *cbdata)
{
struct bpointers *bp = cbdata;
#else
static int ext3_ext_new_extent_cb(struct ext3_ext_base *base,
struct ext3_ext_path *path,
- struct ext3_ext_cache *cex)
+ struct ext3_ext_cache *cex
+#ifdef HAVE_EXT_PREPARE_CB_EXTENT
+ , struct ext3_extent *ex
+#endif
+ )
{
struct bpointers *bp = base->private;
#endif
tgen = EXT_GENERATION(base);
count = ext3_ext_calc_credits_for_insert(base, path);
- ext3_up_truncate_sem(inode);
+ fsfilt_up_truncate_sem(inode);
- handle = fsfilt_ext3_journal_start(inode, count+EXT3_ALLOC_NEEDED+1);
+ handle = ext3_journal_start(inode, count+EXT3_ALLOC_NEEDED+1);
if (IS_ERR(handle)) {
- ext3_down_truncate_sem(inode);
+ fsfilt_down_truncate_sem(inode);
return PTR_ERR(handle);
}
- ext3_down_truncate_sem(inode);
+ fsfilt_down_truncate_sem(inode);
if (tgen != EXT_GENERATION(base)) {
/* the tree has changed. so path can be invalid at moment */
- fsfilt_ext3_journal_stop(handle);
+ ext3_journal_stop(handle);
return EXT_REPEAT;
}
EXT_ASSERT(count <= cex->ec_len);
/* insert new extent */
- nex.ee_block = cex->ec_block;
- nex.ee_start = pblock;
- nex.ee_len = count;
+ nex.ee_block = cpu_to_le32(cex->ec_block);
+ ext3_ext_store_pblock(&nex, pblock);
+ nex.ee_len = cpu_to_le16(count);
err = ext3_ext_insert_extent(handle, base, path, &nex);
if (err) {
- CERROR("can't insert extent: %d\n", err);
- /* XXX: export ext3_free_blocks() */
- /*ext3_free_blocks(handle, inode, nex.ee_start, nex.ee_len, 0);*/
+ /* free data blocks we just allocated */
+ /* not a good idea to call discard here directly,
+ * but otherwise we'd need to call it every free() */
+#ifdef EXT3_MB_HINT_GROUP_ALLOC
+ ext3_mb_discard_inode_preallocations(inode);
+#endif
+ ext3_free_blocks(handle, inode, ext_pblock(&nex),
+ cpu_to_le16(nex.ee_len), 0);
goto out;
}
* we are asking ext3_ext_walk_space() to continue
* scaning after that block
*/
- cex->ec_len = nex.ee_len;
- cex->ec_start = nex.ee_start;
- BUG_ON(nex.ee_len == 0);
- BUG_ON(nex.ee_block != cex->ec_block);
+ cex->ec_len = le16_to_cpu(nex.ee_len);
+ cex->ec_start = ext_pblock(&nex);
+ BUG_ON(le16_to_cpu(nex.ee_len) == 0);
+ BUG_ON(le32_to_cpu(nex.ee_block) != cex->ec_block);
out:
- fsfilt_ext3_journal_stop(handle);
+ ext3_journal_stop(handle);
map:
if (err >= 0) {
/* map blocks */
CERROR("hmm. why do we find this extent?\n");
CERROR("initial space: %lu:%u\n",
bp->start, bp->init_num);
- CERROR("current extent: %u/%u/%u %d\n",
+ CERROR("current extent: %u/%u/%llu %d\n",
cex->ec_block, cex->ec_len,
- cex->ec_start, cex->ec_type);
+ (unsigned long long)cex->ec_start,
+ cex->ec_type);
}
i = 0;
if (cex->ec_block < bp->start)
bp.init_num = bp.num = num;
bp.create = create;
- ext3_down_truncate_sem(inode);
+ fsfilt_down_truncate_sem(inode);
err = fsfilt_ext3_ext_walk_space(base, block, num,
ext3_ext_new_extent_cb, &bp);
ext3_ext_invalidate_cache(base);
- ext3_up_truncate_sem(inode);
+ fsfilt_up_truncate_sem(inode);
return err;
}
block_count = (*offs & (blocksize - 1)) + bufsize;
block_count = (block_count + blocksize - 1) >> inode->i_blkbits;
- handle = fsfilt_ext3_journal_start(inode,
+ handle = ext3_journal_start(inode,
block_count * FSFILT_DATA_TRANS_BLOCKS(inode->i_sb) + 2);
if (IS_ERR(handle)) {
CERROR("can't start transaction for %d blocks (%d bytes)\n",
if (!err && force_sync)
handle->h_sync = 1; /* recovery likes this */
- fsfilt_ext3_journal_stop(handle);
+ ext3_journal_stop(handle);
return err;
}
static int fsfilt_ext3_setup(struct super_block *sb)
{
+#if ((LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,6)) && \
+ defined(HAVE_QUOTA_SUPPORT)) || defined(S_PDIROPS)
+ struct ext3_sb_info *sbi = EXT3_SB(sb);
#if 0
- EXT3_SB(sb)->dx_lock = fsfilt_ext3_dx_lock;
- EXT3_SB(sb)->dx_unlock = fsfilt_ext3_dx_unlock;
+ sbi->dx_lock = fsfilt_ext3_dx_lock;
+ sbi->dx_unlock = fsfilt_ext3_dx_unlock;
+#endif
#endif
#ifdef S_PDIROPS
CWARN("Enabling PDIROPS\n");
- set_opt(EXT3_SB(sb)->s_mount_opt, PDIROPS);
+ set_opt(sbi->s_mount_opt, PDIROPS);
sb->s_flags |= S_PDIROPS;
#endif
if (!EXT3_HAS_COMPAT_FEATURE(sb, EXT3_FEATURE_COMPAT_DIR_INDEX))
CWARN("filesystem doesn't have dir_index feature enabled\n");
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,13)) && HAVE_QUOTA_SUPPORT
- set_opt(EXT3_SB(sb)->s_mount_opt, QUOTA);
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,6)) && defined(HAVE_QUOTA_SUPPORT)
+ /* enable journaled quota support */
+ /* kfreed in ext3_put_super() */
+ sbi->s_qf_names[USRQUOTA] = kstrdup("lquota.user.reserved", GFP_KERNEL);
+ if (!sbi->s_qf_names[USRQUOTA])
+ return -ENOMEM;
+ sbi->s_qf_names[GRPQUOTA] = kstrdup("lquota.group.reserved", GFP_KERNEL);
+ if (!sbi->s_qf_names[GRPQUOTA]) {
+ kfree(sbi->s_qf_names[USRQUOTA]);
+ sbi->s_qf_names[USRQUOTA] = NULL;
+ return -ENOMEM;
+ }
+ sbi->s_jquota_fmt = QFMT_VFS_V0;
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,13))
+ set_opt(sbi->s_mount_opt, QUOTA);
+#endif
#endif
return 0;
}
return 0;
}
-static const char *op_quotafile[] = { "lquota.user", "lquota.group" };
-
+#ifdef HAVE_QUOTA_SUPPORT
#define DQINFO_COPY(out, in) \
do { \
Q_COPY(out, in, dqi_bgrace); \
Q_COPY(out, in, dqb_valid); \
} while (0)
-
-
static int fsfilt_ext3_quotactl(struct super_block *sb,
struct obd_quotactl *oqc)
{
continue;
if (oqc->qc_cmd == Q_QUOTAON) {
+ char *name[MAXQUOTAS] = LUSTRE_OPQFILES_NAMES_V2;
+
+ LASSERT(oqc->qc_id == LUSTRE_QUOTA_V2);
+
if (!qcop->quota_on)
GOTO(out, rc = -ENOSYS);
- rc = qcop->quota_on(sb, i, oqc->qc_id,
- (char *)op_quotafile[i]);
+
+ rc = qcop->quota_on(sb, i, QFMT_VFS_V0,
+ name[i]);
} else if (oqc->qc_cmd == Q_QUOTAOFF) {
if (!qcop->quota_off)
GOTO(out, rc = -ENOSYS);
if (!qcop->get_dqblk)
GOTO(out, rc = -ENOSYS);
rc = qcop->get_dqblk(sb, oqc->qc_type, oqc->qc_id, dqblk);
+ if (!rc)
+ dqblk->dqb_valid = QIF_LIMITS | QIF_USAGE;
break;
case Q_SYNC:
if (!sb->s_qcop->quota_sync)
GOTO(out, rc = -ENOSYS);
qcop->quota_sync(sb, oqc->qc_type);
break;
+ case Q_FINVALIDATE:
+ CDEBUG(D_WARNING, "invalidating operational quota files\n");
+ for (i = 0; i < MAXQUOTAS; i++) {
+ struct file *fp;
+ char *name[MAXQUOTAS] = LUSTRE_OPQFILES_NAMES_V2;
+
+ LASSERT(oqc->qc_id == LUSTRE_QUOTA_V2);
+
+ if (!Q_TYPESET(oqc, i))
+ continue;
+
+ fp = filp_open(name[i], O_CREAT | O_TRUNC | O_RDWR, 0644);
+ if (IS_ERR(fp)) {
+ rc = PTR_ERR(fp);
+ CERROR("error invalidating operational quota file"
+ " %s (rc:%d)\n", name[i], rc);
+ } else {
+ filp_close(fp, 0);
+ }
+
+ }
+ break;
default:
- CERROR("unsupported quotactl command: %d", oqc->qc_cmd);
+ CERROR("unsupported quotactl command: %d\n", oqc->qc_cmd);
LBUG();
}
out:
OBD_FREE_PTR(dqblk);
if (rc)
- CDEBUG(D_QUOTA, "quotactl command %#x, id %u, type %d "
+ CDEBUG(D_QUOTA, "quotactl command %#x, id %u, type %u "
"failed: %d\n",
oqc->qc_cmd, oqc->qc_id, oqc->qc_type, rc);
RETURN(rc);
}
struct chk_dqblk{
- struct hlist_node dqb_hash; /* quotacheck hash */
- struct list_head dqb_list; /* in list also */
- qid_t dqb_id; /* uid/gid */
- short dqb_type; /* USRQUOTA/GRPQUOTA */
- __u32 dqb_bhardlimit; /* block hard limit */
- __u32 dqb_bsoftlimit; /* block soft limit */
- qsize_t dqb_curspace; /* current space */
- __u32 dqb_ihardlimit; /* inode hard limit */
- __u32 dqb_isoftlimit; /* inode soft limit */
- __u32 dqb_curinodes; /* current inodes */
- __u64 dqb_btime; /* block grace time */
- __u64 dqb_itime; /* inode grace time */
- __u32 dqb_valid; /* flag for above fields */
+ struct hlist_node dqb_hash; /** quotacheck hash */
+ struct list_head dqb_list; /** in list also */
+ qid_t dqb_id; /** uid/gid */
+ short dqb_type; /** USRQUOTA/GRPQUOTA */
+ qsize_t dqb_bhardlimit; /** block hard limit */
+ qsize_t dqb_bsoftlimit; /** block soft limit */
+ qsize_t dqb_curspace; /** current space */
+ qsize_t dqb_ihardlimit; /** inode hard limit */
+ qsize_t dqb_isoftlimit; /** inode soft limit */
+ qsize_t dqb_curinodes; /** current inodes */
+ __u64 dqb_btime; /** block grace time */
+ __u64 dqb_itime; /** inode grace time */
+ __u32 dqb_valid; /** flag for above fields */
};
static inline unsigned int chkquot_hash(qid_t id, int type)
return cdqb;
}
-static inline int quota_onoff(struct super_block *sb, int cmd, int type)
+static inline int quota_onoff(struct super_block *sb, int cmd, int type, int qfmt)
{
struct obd_quotactl *oqctl;
int rc;
RETURN(-ENOMEM);
oqctl->qc_cmd = cmd;
- oqctl->qc_id = QFMT_LDISKFS;
+ oqctl->qc_id = qfmt;
oqctl->qc_type = type;
rc = fsfilt_ext3_quotactl(sb, oqctl);
return gdp + desc;
}
+
+#ifndef HAVE_EXT4_LDISKFS
static inline struct buffer_head *
-read_inode_bitmap(struct super_block *sb, unsigned long group)
+ext3_read_inode_bitmap(struct super_block *sb, unsigned long group)
{
struct ext3_group_desc *desc;
struct buffer_head *bh;
desc = get_group_desc(sb, group);
- bh = sb_bread(sb, le32_to_cpu(desc->bg_inode_bitmap));
-
+ bh = sb_bread(sb, ext3_inode_bitmap(sb, desc));
return bh;
}
+#endif
static inline struct inode *ext3_iget_inuse(struct super_block *sb,
struct buffer_head *bitmap_bh,
{
struct inode *inode = NULL;
+
if (ext3_test_bit(index, bitmap_bh->b_data))
+#ifdef HAVE_EXT4_LDISKFS
+ inode = ext4_iget(sb, ino);
+ if (IS_ERR(inode))
+ /* Newer kernels return an error instead of a NULL pointer */
+ inode = NULL;
+#else
inode = iget(sb, ino);
-
+#endif
return inode;
}
return rc;
}
-static int v2_write_dqheader(struct file *f, int type)
-{
- static const __u32 quota_magics[] = V2_INITQMAGICS;
- static const __u32 quota_versions[] = V2_INITQVERSIONS;
- struct v2_disk_dqheader dqhead;
- loff_t offset = 0;
-
- CLASSERT(ARRAY_SIZE(quota_magics) == ARRAY_SIZE(quota_versions));
- LASSERT(0 <= type && type < ARRAY_SIZE(quota_magics));
-
- dqhead.dqh_magic = cpu_to_le32(quota_magics[type]);
- dqhead.dqh_version = cpu_to_le32(quota_versions[type]);
-
- return cfs_user_write(f, (char *)&dqhead, sizeof(dqhead), &offset);
-}
-
/* write dqinfo struct in a new quota file */
-static int v2_write_dqinfo(struct file *f, int type, struct if_dqinfo *info)
+static int v3_write_dqinfo(struct file *f, int type, struct if_dqinfo *info)
{
struct v2_disk_dqinfo dqinfo;
__u32 blocks = V2_DQTREEOFF + 1;
return cfs_user_write(f, (char *)&dqinfo, sizeof(dqinfo), &offset);
}
+static int v3_write_dqheader(struct file *f, int type)
+{
+ static const __u32 quota_magics[] = V2_INITQMAGICS;
+ static const __u32 quota_versions[] = V2_INITQVERSIONS_R1;
+ struct v2_disk_dqheader dqhead;
+ loff_t offset = 0;
+
+ CLASSERT(ARRAY_SIZE(quota_magics) == ARRAY_SIZE(quota_versions));
+ LASSERT(0 <= type && type < ARRAY_SIZE(quota_magics));
+
+ dqhead.dqh_magic = cpu_to_le32(quota_magics[type]);
+ dqhead.dqh_version = cpu_to_le32(quota_versions[type]);
+
+ return cfs_user_write(f, (char *)&dqhead, sizeof(dqhead), &offset);
+}
+
static int create_new_quota_files(struct qchk_ctxt *qctxt,
struct obd_quotactl *oqc)
{
struct if_dqinfo *info = qctxt->qckt_first_check[i]?
NULL : &qctxt->qckt_dqinfo[i];
struct file *file;
+ const char *name[MAXQUOTAS] = LUSTRE_OPQFILES_NAMES_V2;
if (!Q_TYPESET(oqc, i))
continue;
- file = filp_open(op_quotafile[i], O_RDWR | O_CREAT | O_TRUNC,
- 0644);
+ LASSERT(oqc->qc_id == LUSTRE_QUOTA_V2);
+
+ file = filp_open(name[i], O_RDWR | O_CREAT | O_TRUNC, 0644);
if (IS_ERR(file)) {
rc = PTR_ERR(file);
CERROR("can't create %s file: rc = %d\n",
- op_quotafile[i], rc);
+ name[i], rc);
GOTO(out, rc);
}
if (!S_ISREG(file->f_dentry->d_inode->i_mode)) {
- CERROR("file %s is not regular", op_quotafile[i]);
+ CERROR("file %s is not regular", name[i]);
filp_close(file, 0);
GOTO(out, rc = -EINVAL);
}
- rc = v2_write_dqheader(file, i);
+ DQUOT_DROP(file->f_dentry->d_inode);
+
+ rc = v3_write_dqheader(file, i);
if (rc) {
filp_close(file, 0);
GOTO(out, rc);
}
- rc = v2_write_dqinfo(file, i, info);
+ rc = v3_write_dqinfo(file, i, info);
filp_close(file, 0);
if (rc)
GOTO(out, rc);
if (!oqc)
RETURN(-ENOMEM);
- now = CURRENT_SECONDS;
+ now = cfs_time_current_sec();
if (cdqb->dqb_bsoftlimit &&
toqb(cdqb->dqb_curspace) >= cdqb->dqb_bsoftlimit &&
!cdqb->dqb_btime)
- cdqb->dqb_btime =
+ cdqb->dqb_btime =
now + qctxt->qckt_dqinfo[cdqb->dqb_type].dqi_bgrace;
if (cdqb->dqb_isoftlimit &&
cdqb->dqb_curinodes >= cdqb->dqb_isoftlimit &&
!cdqb->dqb_itime)
- cdqb->dqb_itime =
+ cdqb->dqb_itime =
now + qctxt->qckt_dqinfo[cdqb->dqb_type].dqi_igrace;
cdqb->dqb_valid = QIF_ALL;
if (!Q_TYPESET(oqc, i))
continue;
- rc = quota_onoff(sb, Q_QUOTAON, i);
+ rc = quota_onoff(sb, Q_QUOTAON, i, oqc->qc_id);
if (!rc || rc == -EBUSY) {
rc = read_old_dqinfo(sb, i, qctxt->qckt_dqinfo);
if (rc)
GOTO(out, rc);
- } else if (rc == -ENOENT) {
+ } else if (rc == -ENOENT || rc == -EINVAL || rc == -EEXIST) {
qctxt->qckt_first_check[i] = 1;
} else if (rc) {
GOTO(out, rc);
/* check quota and update in hash */
for (group = 0; group < sbi->s_groups_count; group++) {
+ struct ext3_group_desc *desc;
+ desc = get_group_desc(sb, group);
+ if (!desc)
+ GOTO(out, -EIO);
+
+ spin_lock(sb_bgl_lock(sbi, group));
+ if (desc->bg_flags & cpu_to_le16(EXT3_BG_INODE_UNINIT)) {
+ /* no inode in use in this group, just skip it */
+ spin_unlock(sb_bgl_lock(sbi, group));
+ continue;
+ }
+ spin_unlock(sb_bgl_lock(sbi, group));
+
ino = group * sbi->s_inodes_per_group + 1;
- bitmap_bh = read_inode_bitmap(sb, group);
+ bitmap_bh = ext3_read_inode_bitmap(sb, group);
if (!bitmap_bh) {
- CERROR("read_inode_bitmap group %d failed", group);
+ CERROR("ext3_read_inode_bitmap group %d failed", group);
GOTO(out, rc = -EIO);
}
LASSERT(sb_dqopt(sb)->files[i] != NULL);
INIT_LIST_HEAD(&id_list);
-#ifndef KERNEL_SUPPORTS_QUOTA_READ
+#ifndef KERNEL_SUPPORTS_QUOTA_READ
rc = lustre_get_qids(sb_dqopt(sb)->files[i], NULL, i, &id_list);
#else
rc = lustre_get_qids(NULL, sb_dqopt(sb)->files[i], i, &id_list);
cqget(sb, qctxt->qckt_hash, &qctxt->qckt_list,
dqid->di_id, i,
qctxt->qckt_first_check[i]);
- kfree(dqid);
+ OBD_FREE_PTR(dqid);
}
}
#endif
/* turn off quota cause we are to dump chk_dqblk to files */
- quota_onoff(sb, Q_QUOTAOFF, oqc->qc_type);
+ quota_onoff(sb, Q_QUOTAOFF, oqc->qc_type, oqc->qc_id);
rc = create_new_quota_files(qctxt, oqc);
if (rc)
GOTO(out, rc);
/* we use vfs functions to set dqblk, so turn quota on */
- rc = quota_onoff(sb, Q_QUOTAON, oqc->qc_type);
+ rc = quota_onoff(sb, Q_QUOTAON, oqc->qc_type, oqc->qc_id);
out:
/* dump and free chk_dqblk */
rc = prune_chkquots(sb, qctxt, rc);
/* turn off quota, `lfs quotacheck` will turn on when all
* nodes quotacheck finish. */
- quota_onoff(sb, Q_QUOTAOFF, oqc->qc_type);
+ quota_onoff(sb, Q_QUOTAOFF, oqc->qc_type, oqc->qc_id);
oqc->qc_stat = rc;
if (rc)
RETURN(rc);
}
-#ifdef HAVE_QUOTA_SUPPORT
static int fsfilt_ext3_quotainfo(struct lustre_quota_info *lqi, int type,
int cmd)
{
case QFILE_INIT_INFO:
rc = lustre_init_quota_info(lqi, type);
break;
+ case QFILE_CONVERT:
+ rc = -ENOTSUPP;
+ CERROR("quota CONVERT command is not supported\n");
+ break;
default:
- CERROR("Unsupported admin quota file cmd %d\n", cmd);
- LBUG();
+ rc = -ENOTSUPP;
+ CERROR("Unsupported admin quota file cmd %d\n"
+ "Are lquota.ko and fsfilt_ldiskfs.ko modules in sync?\n",
+ cmd);
break;
}
RETURN(rc);
}
RETURN(rc);
}
+
+static int fsfilt_ext3_get_mblk(struct super_block *sb, int *count,
+ struct inode *inode, int frags)
+{
+#ifdef EXT3_EXT_HAS_NO_TREE
+ struct ext3_ext_base *base = inode;
+#else
+ struct ext3_extents_tree tree;
+ struct ext3_ext_base *base = &tree;
+
+ ext3_init_tree_desc(base, inode);
+#endif
+ /* for an ost_write request, it needs <#fragments> * <tree depth + 1>
+ * metablocks at maxium b=16542 */
+ *count = frags * (EXT_DEPTH(base) + 1) * EXT3_BLOCK_SIZE(sb);
+ return 0;
+}
+
#endif
lvfs_sbdev_type fsfilt_ext3_journal_sbdev(struct super_block *sb)
.fs_setup = fsfilt_ext3_setup,
.fs_send_bio = fsfilt_ext3_send_bio,
.fs_get_op_len = fsfilt_ext3_get_op_len,
- .fs_quotactl = fsfilt_ext3_quotactl,
- .fs_quotacheck = fsfilt_ext3_quotacheck,
#ifdef HAVE_DISK_INODE_VERSION
.fs_get_version = fsfilt_ext3_get_version,
.fs_set_version = fsfilt_ext3_set_version,
#endif
#ifdef HAVE_QUOTA_SUPPORT
+ .fs_quotactl = fsfilt_ext3_quotactl,
+ .fs_quotacheck = fsfilt_ext3_quotacheck,
.fs_quotainfo = fsfilt_ext3_quotainfo,
.fs_qids = fsfilt_ext3_qids,
.fs_dquot = fsfilt_ext3_dquot,
+ .fs_get_mblk = fsfilt_ext3_get_mblk,
#endif
.fs_journal_sbdev = fsfilt_ext3_journal_sbdev,
};
module_init(fsfilt_ext3_init);
module_exit(fsfilt_ext3_exit);
-MODULE_AUTHOR("Cluster File Systems, Inc. <info@clusterfs.com>");
+MODULE_AUTHOR("Sun Microsystems, Inc. <http://www.lustre.org/>");
MODULE_DESCRIPTION("Lustre ext3 Filesystem Helper v0.1");
MODULE_LICENSE("GPL");
git://git.whamcloud.com / fs / lustre-release.git / blobdiff