* of the GNU General Public License version 2.
*/
-#include <linux/sched.h>
#include <linux/slab.h>
#include <linux/spinlock.h>
#include <linux/completion.h>
#include <linux/gfs2_ondisk.h>
#include <linux/ext2_fs.h>
#include <linux/crc32.h>
-#include <linux/iflags.h>
#include <linux/lm_interface.h>
+#include <linux/writeback.h>
#include <asm/uaccess.h>
#include "gfs2.h"
#include "util.h"
#include "eaops.h"
-/* "bad" is for NFS support */
-struct filldir_bad_entry {
- char *fbe_name;
- unsigned int fbe_length;
- u64 fbe_offset;
- struct gfs2_inum fbe_inum;
- unsigned int fbe_type;
-};
-
-struct filldir_bad {
- struct gfs2_sbd *fdb_sbd;
-
- struct filldir_bad_entry *fdb_entry;
- unsigned int fdb_entry_num;
- unsigned int fdb_entry_off;
-
- char *fdb_name;
- unsigned int fdb_name_size;
- unsigned int fdb_name_off;
-};
-
-/* For regular, non-NFS */
-struct filldir_reg {
- struct gfs2_sbd *fdr_sbd;
- int fdr_prefetch;
-
- filldir_t fdr_filldir;
- void *fdr_opaque;
-};
-
/*
* Most fields left uninitialised to catch anybody who tries to
* use them. f_flags set to prevent file_accessed() from touching
size = count;
kaddr = kmap(page);
- memcpy(desc->arg.buf, kaddr + offset, size);
+ memcpy(desc->arg.data, kaddr + offset, size);
kunmap(page);
desc->count = count - size;
struct inode *inode = &ip->i_inode;
read_descriptor_t desc;
desc.written = 0;
- desc.arg.buf = buf;
+ desc.arg.data = buf;
desc.count = size;
desc.error = 0;
do_generic_mapping_read(inode->i_mapping, ra_state,
}
/**
- * filldir_reg_func - Report a directory entry to the caller of gfs2_dir_read()
- * @opaque: opaque data used by the function
- * @name: the name of the directory entry
- * @length: the length of the name
- * @offset: the entry's offset in the directory
- * @inum: the inode number the entry points to
- * @type: the type of inode the entry points to
- *
- * Returns: 0 on success, 1 if buffer full
- */
-
-static int filldir_reg_func(void *opaque, const char *name, unsigned int length,
- u64 offset, struct gfs2_inum *inum,
- unsigned int type)
-{
- struct filldir_reg *fdr = (struct filldir_reg *)opaque;
- struct gfs2_sbd *sdp = fdr->fdr_sbd;
- int error;
-
- error = fdr->fdr_filldir(fdr->fdr_opaque, name, length, offset,
- inum->no_addr, type);
- if (error)
- return 1;
-
- if (fdr->fdr_prefetch && !(length == 1 && *name == '.')) {
- gfs2_glock_prefetch_num(sdp,
- inum->no_addr, &gfs2_inode_glops,
- LM_ST_SHARED, LM_FLAG_TRY | LM_FLAG_ANY);
- gfs2_glock_prefetch_num(sdp,
- inum->no_addr, &gfs2_iopen_glops,
- LM_ST_SHARED, LM_FLAG_TRY);
- }
-
- return 0;
-}
-
-/**
- * readdir_reg - Read directory entries from a directory
+ * gfs2_readdir - Read directory entries from a directory
* @file: The directory to read from
* @dirent: Buffer for dirents
* @filldir: Function used to do the copying
* Returns: errno
*/
-static int readdir_reg(struct file *file, void *dirent, filldir_t filldir)
+static int gfs2_readdir(struct file *file, void *dirent, filldir_t filldir)
{
struct inode *dir = file->f_mapping->host;
struct gfs2_inode *dip = GFS2_I(dir);
- struct filldir_reg fdr;
struct gfs2_holder d_gh;
u64 offset = file->f_pos;
int error;
- fdr.fdr_sbd = GFS2_SB(dir);
- fdr.fdr_prefetch = 1;
- fdr.fdr_filldir = filldir;
- fdr.fdr_opaque = dirent;
-
gfs2_holder_init(dip->i_gl, LM_ST_SHARED, GL_ATIME, &d_gh);
error = gfs2_glock_nq_atime(&d_gh);
if (error) {
return error;
}
- error = gfs2_dir_read(dir, &offset, &fdr, filldir_reg_func);
+ error = gfs2_dir_read(dir, &offset, dirent, filldir);
gfs2_glock_dq_uninit(&d_gh);
}
/**
- * filldir_bad_func - Report a directory entry to the caller of gfs2_dir_read()
- * @opaque: opaque data used by the function
- * @name: the name of the directory entry
- * @length: the length of the name
- * @offset: the entry's offset in the directory
- * @inum: the inode number the entry points to
- * @type: the type of inode the entry points to
+ * fsflags_cvt
+ * @table: A table of 32 u32 flags
+ * @val: a 32 bit value to convert
*
- * For supporting NFS.
+ * This function can be used to convert between fsflags values and
+ * GFS2's own flags values.
*
- * Returns: 0 on success, 1 if buffer full
+ * Returns: the converted flags
*/
-
-static int filldir_bad_func(void *opaque, const char *name, unsigned int length,
- u64 offset, struct gfs2_inum *inum,
- unsigned int type)
+static u32 fsflags_cvt(const u32 *table, u32 val)
{
- struct filldir_bad *fdb = (struct filldir_bad *)opaque;
- struct gfs2_sbd *sdp = fdb->fdb_sbd;
- struct filldir_bad_entry *fbe;
-
- if (fdb->fdb_entry_off == fdb->fdb_entry_num ||
- fdb->fdb_name_off + length > fdb->fdb_name_size)
- return 1;
-
- fbe = &fdb->fdb_entry[fdb->fdb_entry_off];
- fbe->fbe_name = fdb->fdb_name + fdb->fdb_name_off;
- memcpy(fbe->fbe_name, name, length);
- fbe->fbe_length = length;
- fbe->fbe_offset = offset;
- fbe->fbe_inum = *inum;
- fbe->fbe_type = type;
-
- fdb->fdb_entry_off++;
- fdb->fdb_name_off += length;
-
- if (!(length == 1 && *name == '.')) {
- gfs2_glock_prefetch_num(sdp,
- inum->no_addr, &gfs2_inode_glops,
- LM_ST_SHARED, LM_FLAG_TRY | LM_FLAG_ANY);
- gfs2_glock_prefetch_num(sdp,
- inum->no_addr, &gfs2_iopen_glops,
- LM_ST_SHARED, LM_FLAG_TRY);
- }
-
- return 0;
-}
-
-/**
- * readdir_bad - Read directory entries from a directory
- * @file: The directory to read from
- * @dirent: Buffer for dirents
- * @filldir: Function used to do the copying
- *
- * For supporting NFS.
- *
- * Returns: errno
- */
-
-static int readdir_bad(struct file *file, void *dirent, filldir_t filldir)
-{
- struct inode *dir = file->f_mapping->host;
- struct gfs2_inode *dip = GFS2_I(dir);
- struct gfs2_sbd *sdp = GFS2_SB(dir);
- struct filldir_reg fdr;
- unsigned int entries, size;
- struct filldir_bad *fdb;
- struct gfs2_holder d_gh;
- u64 offset = file->f_pos;
- unsigned int x;
- struct filldir_bad_entry *fbe;
- int error;
-
- entries = gfs2_tune_get(sdp, gt_entries_per_readdir);
- size = sizeof(struct filldir_bad) +
- entries * (sizeof(struct filldir_bad_entry) + GFS2_FAST_NAME_SIZE);
-
- fdb = kzalloc(size, GFP_KERNEL);
- if (!fdb)
- return -ENOMEM;
-
- fdb->fdb_sbd = sdp;
- fdb->fdb_entry = (struct filldir_bad_entry *)(fdb + 1);
- fdb->fdb_entry_num = entries;
- fdb->fdb_name = ((char *)fdb) + sizeof(struct filldir_bad) +
- entries * sizeof(struct filldir_bad_entry);
- fdb->fdb_name_size = entries * GFS2_FAST_NAME_SIZE;
-
- gfs2_holder_init(dip->i_gl, LM_ST_SHARED, GL_ATIME, &d_gh);
- error = gfs2_glock_nq_atime(&d_gh);
- if (error) {
- gfs2_holder_uninit(&d_gh);
- goto out;
+ u32 res = 0;
+ while(val) {
+ if (val & 1)
+ res |= *table;
+ table++;
+ val >>= 1;
}
-
- error = gfs2_dir_read(dir, &offset, fdb, filldir_bad_func);
-
- gfs2_glock_dq_uninit(&d_gh);
-
- fdr.fdr_sbd = sdp;
- fdr.fdr_prefetch = 0;
- fdr.fdr_filldir = filldir;
- fdr.fdr_opaque = dirent;
-
- for (x = 0; x < fdb->fdb_entry_off; x++) {
- fbe = &fdb->fdb_entry[x];
-
- error = filldir_reg_func(&fdr,
- fbe->fbe_name, fbe->fbe_length,
- fbe->fbe_offset,
- &fbe->fbe_inum, fbe->fbe_type);
- if (error) {
- file->f_pos = fbe->fbe_offset;
- error = 0;
- goto out;
- }
- }
-
- file->f_pos = offset;
-
-out:
- kfree(fdb);
- return error;
+ return res;
}
-/**
- * gfs2_readdir - Read directory entries from a directory
- * @file: The directory to read from
- * @dirent: Buffer for dirents
- * @filldir: Function used to do the copying
- *
- * Returns: errno
- */
-
-static int gfs2_readdir(struct file *file, void *dirent, filldir_t filldir)
-{
- int error;
-
- if (strcmp(current->comm, "nfsd") != 0)
- error = readdir_reg(file, dirent, filldir);
- else
- error = readdir_bad(file, dirent, filldir);
-
- return error;
-}
-
-static const u32 iflags_to_gfs2[32] = {
- [iflag_Sync] = GFS2_DIF_SYNC,
- [iflag_Immutable] = GFS2_DIF_IMMUTABLE,
- [iflag_Append] = GFS2_DIF_APPENDONLY,
- [iflag_NoAtime] = GFS2_DIF_NOATIME,
- [iflag_Index] = GFS2_DIF_EXHASH,
- [iflag_JournalData] = GFS2_DIF_JDATA,
- [iflag_DirectIO] = GFS2_DIF_DIRECTIO,
+static const u32 fsflags_to_gfs2[32] = {
+ [3] = GFS2_DIF_SYNC,
+ [4] = GFS2_DIF_IMMUTABLE,
+ [5] = GFS2_DIF_APPENDONLY,
+ [7] = GFS2_DIF_NOATIME,
+ [12] = GFS2_DIF_EXHASH,
+ [14] = GFS2_DIF_JDATA,
+ [20] = GFS2_DIF_DIRECTIO,
};
-static const u32 gfs2_to_iflags[32] = {
- [gfs2fl_Sync] = IFLAG_SYNC,
- [gfs2fl_Immutable] = IFLAG_IMMUTABLE,
- [gfs2fl_AppendOnly] = IFLAG_APPEND,
- [gfs2fl_NoAtime] = IFLAG_NOATIME,
- [gfs2fl_ExHash] = IFLAG_INDEX,
- [gfs2fl_Jdata] = IFLAG_JOURNAL_DATA,
- [gfs2fl_Directio] = IFLAG_DIRECTIO,
- [gfs2fl_InheritDirectio] = IFLAG_DIRECTIO,
- [gfs2fl_InheritJdata] = IFLAG_JOURNAL_DATA,
+static const u32 gfs2_to_fsflags[32] = {
+ [gfs2fl_Sync] = FS_SYNC_FL,
+ [gfs2fl_Immutable] = FS_IMMUTABLE_FL,
+ [gfs2fl_AppendOnly] = FS_APPEND_FL,
+ [gfs2fl_NoAtime] = FS_NOATIME_FL,
+ [gfs2fl_ExHash] = FS_INDEX_FL,
+ [gfs2fl_Jdata] = FS_JOURNAL_DATA_FL,
+ [gfs2fl_Directio] = FS_DIRECTIO_FL,
+ [gfs2fl_InheritDirectio] = FS_DIRECTIO_FL,
+ [gfs2fl_InheritJdata] = FS_JOURNAL_DATA_FL,
};
static int gfs2_get_flags(struct file *filp, u32 __user *ptr)
{
- struct inode *inode = filp->f_dentry->d_inode;
+ struct inode *inode = filp->f_path.dentry->d_inode;
struct gfs2_inode *ip = GFS2_I(inode);
struct gfs2_holder gh;
int error;
- u32 iflags;
+ u32 fsflags;
gfs2_holder_init(ip->i_gl, LM_ST_SHARED, GL_ATIME, &gh);
- error = gfs2_glock_nq_m_atime(1, &gh);
+ error = gfs2_glock_nq_atime(&gh);
if (error)
return error;
-
- iflags = iflags_cvt(gfs2_to_iflags, ip->i_di.di_flags);
- if (put_user(iflags, ptr))
+
+ fsflags = fsflags_cvt(gfs2_to_fsflags, ip->i_di.di_flags);
+ if (put_user(fsflags, ptr))
error = -EFAULT;
gfs2_glock_dq_m(1, &gh);
return error;
}
+void gfs2_set_inode_flags(struct inode *inode)
+{
+ struct gfs2_inode *ip = GFS2_I(inode);
+ struct gfs2_dinode_host *di = &ip->i_di;
+ unsigned int flags = inode->i_flags;
+
+ flags &= ~(S_SYNC|S_APPEND|S_IMMUTABLE|S_NOATIME|S_DIRSYNC);
+ if (di->di_flags & GFS2_DIF_IMMUTABLE)
+ flags |= S_IMMUTABLE;
+ if (di->di_flags & GFS2_DIF_APPENDONLY)
+ flags |= S_APPEND;
+ if (di->di_flags & GFS2_DIF_NOATIME)
+ flags |= S_NOATIME;
+ if (di->di_flags & GFS2_DIF_SYNC)
+ flags |= S_SYNC;
+ inode->i_flags = flags;
+}
+
/* Flags that can be set by user space */
#define GFS2_FLAGS_USER_SET (GFS2_DIF_JDATA| \
GFS2_DIF_DIRECTIO| \
*/
static int do_gfs2_set_flags(struct file *filp, u32 reqflags, u32 mask)
{
- struct inode *inode = filp->f_dentry->d_inode;
+ struct inode *inode = filp->f_path.dentry->d_inode;
struct gfs2_inode *ip = GFS2_I(inode);
struct gfs2_sbd *sdp = GFS2_SB(inode);
struct buffer_head *bh;
goto out;
if (IS_APPEND(inode) && (new_flags & GFS2_DIF_APPENDONLY))
goto out;
- if (((new_flags ^ flags) & GFS2_DIF_IMMUTABLE) &&
+ if (((new_flags ^ flags) & GFS2_DIF_IMMUTABLE) &&
!capable(CAP_LINUX_IMMUTABLE))
goto out;
if (!IS_IMMUTABLE(inode)) {
goto out_trans_end;
gfs2_trans_add_bh(ip->i_gl, bh, 1);
ip->i_di.di_flags = new_flags;
- gfs2_dinode_out(&ip->i_di, bh->b_data);
+ gfs2_dinode_out(ip, bh->b_data);
brelse(bh);
+ gfs2_set_inode_flags(inode);
out_trans_end:
gfs2_trans_end(sdp);
out:
static int gfs2_set_flags(struct file *filp, u32 __user *ptr)
{
- u32 iflags, gfsflags;
- if (get_user(iflags, ptr))
+ u32 fsflags, gfsflags;
+ if (get_user(fsflags, ptr))
return -EFAULT;
- gfsflags = iflags_cvt(iflags_to_gfs2, iflags);
+ gfsflags = fsflags_cvt(fsflags_to_gfs2, fsflags);
return do_gfs2_set_flags(filp, gfsflags, ~0);
}
static long gfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{
switch(cmd) {
- case IFLAGS_GET_IOC:
+ case FS_IOC_GETFLAGS:
return gfs2_get_flags(filp, (u32 __user *)arg);
- case IFLAGS_SET_IOC:
+ case FS_IOC_SETFLAGS:
return gfs2_set_flags(filp, (u32 __user *)arg);
}
return -ENOTTY;
gfs2_assert_warn(GFS2_SB(inode), !file->private_data);
file->private_data = fp;
- if (S_ISREG(ip->i_di.di_mode)) {
+ if (S_ISREG(ip->i_inode.i_mode)) {
error = gfs2_glock_nq_init(ip->i_gl, LM_ST_SHARED, LM_FLAG_ANY,
&i_gh);
if (error)
* @file: the file that points to the dentry (we ignore this)
* @dentry: the dentry that points to the inode to sync
*
+ * The VFS will flush "normal" data for us. We only need to worry
+ * about metadata here. For journaled data, we just do a log flush
+ * as we can't avoid it. Otherwise we can just bale out if datasync
+ * is set. For stuffed inodes we must flush the log in order to
+ * ensure that all data is on disk.
+ *
+ * The call to write_inode_now() is there to write back metadata and
+ * the inode itself. It does also try and write the data, but thats
+ * (hopefully) a no-op due to the VFS having already called filemap_fdatawrite()
+ * for us.
+ *
* Returns: errno
*/
static int gfs2_fsync(struct file *file, struct dentry *dentry, int datasync)
{
- struct gfs2_inode *ip = GFS2_I(dentry->d_inode);
+ struct inode *inode = dentry->d_inode;
+ int sync_state = inode->i_state & (I_DIRTY_SYNC|I_DIRTY_DATASYNC);
+ int ret = 0;
- gfs2_log_flush(ip->i_gl->gl_sbd, ip->i_gl);
+ if (gfs2_is_jdata(GFS2_I(inode))) {
+ gfs2_log_flush(GFS2_SB(inode), GFS2_I(inode)->i_gl);
+ return 0;
+ }
- return 0;
+ if (sync_state != 0) {
+ if (!datasync)
+ ret = write_inode_now(inode, 0);
+
+ if (gfs2_is_stuffed(GFS2_I(inode)))
+ gfs2_log_flush(GFS2_SB(inode), GFS2_I(inode)->i_gl);
+ }
+
+ return ret;
}
/**
if (!(fl->fl_flags & FL_POSIX))
return -ENOLCK;
- if ((ip->i_di.di_mode & (S_ISGID | S_IXGRP)) == S_ISGID)
+ if ((ip->i_inode.i_mode & (S_ISGID | S_IXGRP)) == S_ISGID)
return -ENOLCK;
if (sdp->sd_args.ar_localflocks) {
if (IS_GETLK(cmd)) {
- struct file_lock tmp;
- int ret;
- ret = posix_test_lock(file, fl, &tmp);
- fl->fl_type = F_UNLCK;
- if (ret)
- memcpy(fl, &tmp, sizeof(struct file_lock));
+ posix_test_lock(file, fl);
return 0;
} else {
return posix_lock_file_wait(file, fl);
{
struct gfs2_file *fp = file->private_data;
struct gfs2_holder *fl_gh = &fp->f_fl_gh;
- struct gfs2_inode *ip = GFS2_I(file->f_dentry->d_inode);
+ struct gfs2_inode *ip = GFS2_I(file->f_path.dentry->d_inode);
struct gfs2_glock *gl;
unsigned int state;
int flags;
goto out;
gfs2_glock_hold(gl);
flock_lock_file_wait(file,
- &(struct file_lock){.fl_type = F_UNLCK});
+ &(struct file_lock){.fl_type = F_UNLCK});
gfs2_glock_dq_uninit(fl_gh);
} else {
error = gfs2_glock_get(GFS2_SB(&ip->i_inode),
if (!(fl->fl_flags & FL_FLOCK))
return -ENOLCK;
- if ((ip->i_di.di_mode & (S_ISGID | S_IXGRP)) == S_ISGID)
+ if ((ip->i_inode.i_mode & (S_ISGID | S_IXGRP)) == S_ISGID)
return -ENOLCK;
if (sdp->sd_args.ar_localflocks)
if (fl->fl_type == F_UNLCK) {
do_unflock(file, fl);
return 0;
- } else
+ } else {
return do_flock(file, cmd, fl);
+ }
}
const struct file_operations gfs2_file_fops = {
.llseek = gfs2_llseek,
- .read = generic_file_read,
- .readv = generic_file_readv,
+ .read = do_sync_read,
.aio_read = generic_file_aio_read,
- .write = generic_file_write,
- .writev = generic_file_writev,
+ .write = do_sync_write,
.aio_write = generic_file_aio_write,
.unlocked_ioctl = gfs2_ioctl,
.mmap = gfs2_mmap,