/*
* Copyright (C) Sistina Software, Inc. 1997-2003 All rights reserved.
- * Copyright (C) 2004-2005 Red Hat, Inc. All rights reserved.
+ * Copyright (C) 2004-2006 Red Hat, Inc. All rights reserved.
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU General Public License v.2.
+ * of the GNU General Public License version 2.
*/
#include <linux/sched.h>
#include <linux/mm.h>
#include <linux/xattr.h>
#include <linux/posix_acl.h>
-#include <asm/semaphore.h>
+#include <linux/gfs2_ondisk.h>
+#include <linux/crc32.h>
+#include <linux/lm_interface.h>
#include <asm/uaccess.h>
#include "gfs2.h"
+#include "incore.h"
#include "acl.h"
#include "bmap.h"
#include "dir.h"
#include "meta_io.h"
#include "ops_dentry.h"
#include "ops_inode.h"
-#include "page.h"
#include "quota.h"
#include "rgrp.h"
#include "trans.h"
-#include "unlinked.h"
+#include "util.h"
/**
* gfs2_create - Create a file
static int gfs2_create(struct inode *dir, struct dentry *dentry,
int mode, struct nameidata *nd)
{
- struct gfs2_inode *dip = get_v2ip(dir), *ip;
- struct gfs2_sbd *sdp = dip->i_sbd;
+ struct gfs2_inode *dip = GFS2_I(dir);
+ struct gfs2_sbd *sdp = GFS2_SB(dir);
struct gfs2_holder ghs[2];
struct inode *inode;
- int new = 1;
- int error;
-
- atomic_inc(&sdp->sd_ops_inode);
gfs2_holder_init(dip->i_gl, 0, 0, ghs);
for (;;) {
- error = gfs2_createi(ghs, &dentry->d_name, S_IFREG | mode);
- if (!error) {
- ip = get_gl2ip(ghs[1].gh_gl);
+ inode = gfs2_createi(ghs, &dentry->d_name, S_IFREG | mode, 0);
+ if (!IS_ERR(inode)) {
gfs2_trans_end(sdp);
if (dip->i_alloc.al_rgd)
gfs2_inplace_release(dip);
gfs2_quota_unlock(dip);
gfs2_alloc_put(dip);
gfs2_glock_dq_uninit_m(2, ghs);
+ mark_inode_dirty(inode);
break;
- } else if (error != -EEXIST ||
+ } else if (PTR_ERR(inode) != -EEXIST ||
(nd->intent.open.flags & O_EXCL)) {
gfs2_holder_uninit(ghs);
- return error;
+ return PTR_ERR(inode);
}
- error = gfs2_lookupi(dip, &dentry->d_name, 0, &ip);
- if (!error) {
- new = 0;
- gfs2_holder_uninit(ghs);
- break;
- } else if (error != -ENOENT) {
- gfs2_holder_uninit(ghs);
- return error;
+ inode = gfs2_lookupi(dir, &dentry->d_name, 0, nd);
+ if (inode) {
+ if (!IS_ERR(inode)) {
+ gfs2_holder_uninit(ghs);
+ break;
+ } else {
+ gfs2_holder_uninit(ghs);
+ return PTR_ERR(inode);
+ }
}
}
- inode = gfs2_ip2v(ip);
- gfs2_inode_put(ip);
-
- if (!inode)
- return -ENOMEM;
-
d_instantiate(dentry, inode);
- if (new)
- mark_inode_dirty(inode);
return 0;
}
static struct dentry *gfs2_lookup(struct inode *dir, struct dentry *dentry,
struct nameidata *nd)
{
- struct gfs2_inode *dip = get_v2ip(dir), *ip;
- struct gfs2_sbd *sdp = dip->i_sbd;
struct inode *inode = NULL;
- int error;
-
- atomic_inc(&sdp->sd_ops_inode);
- if (!sdp->sd_args.ar_localcaching)
- dentry->d_op = &gfs2_dops;
+ dentry->d_op = &gfs2_dops;
- error = gfs2_lookupi(dip, &dentry->d_name, 0, &ip);
- if (!error) {
- inode = gfs2_ip2v(ip);
- gfs2_inode_put(ip);
- if (!inode)
- return ERR_PTR(-ENOMEM);
-
- } else if (error != -ENOENT)
- return ERR_PTR(error);
+ inode = gfs2_lookupi(dir, &dentry->d_name, 0, nd);
+ if (inode && IS_ERR(inode))
+ return ERR_PTR(PTR_ERR(inode));
if (inode)
return d_splice_alias(inode, dentry);
static int gfs2_link(struct dentry *old_dentry, struct inode *dir,
struct dentry *dentry)
{
- struct gfs2_inode *dip = get_v2ip(dir);
- struct gfs2_sbd *sdp = dip->i_sbd;
+ struct gfs2_inode *dip = GFS2_I(dir);
+ struct gfs2_sbd *sdp = GFS2_SB(dir);
struct inode *inode = old_dentry->d_inode;
- struct gfs2_inode *ip = get_v2ip(inode);
+ struct gfs2_inode *ip = GFS2_I(inode);
struct gfs2_holder ghs[2];
int alloc_required;
int error;
- atomic_inc(&sdp->sd_ops_inode);
-
- if (S_ISDIR(ip->i_di.di_mode))
+ if (S_ISDIR(inode->i_mode))
return -EPERM;
gfs2_holder_init(dip->i_gl, LM_ST_EXCLUSIVE, 0, ghs);
if (error)
goto out;
- error = gfs2_repermission(dir, MAY_WRITE | MAY_EXEC, NULL);
+ error = permission(dir, MAY_WRITE | MAY_EXEC, NULL);
if (error)
goto out_gunlock;
- error = gfs2_dir_search(dip, &dentry->d_name, NULL, NULL);
+ error = gfs2_dir_search(dir, &dentry->d_name, NULL, NULL);
switch (error) {
case -ENOENT:
break;
}
error = -EINVAL;
- if (!dip->i_di.di_nlink)
+ if (!dip->i_inode.i_nlink)
goto out_gunlock;
error = -EFBIG;
- if (dip->i_di.di_entries == (uint32_t)-1)
+ if (dip->i_di.di_entries == (u32)-1)
goto out_gunlock;
error = -EPERM;
if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
goto out_gunlock;
error = -EINVAL;
- if (!ip->i_di.di_nlink)
+ if (!ip->i_inode.i_nlink)
goto out_gunlock;
error = -EMLINK;
- if (ip->i_di.di_nlink == (uint32_t)-1)
+ if (ip->i_inode.i_nlink == (u32)-1)
goto out_gunlock;
- error = gfs2_diradd_alloc_required(dip, &dentry->d_name,
- &alloc_required);
- if (error)
+ alloc_required = error = gfs2_diradd_alloc_required(dir, &dentry->d_name);
+ if (error < 0)
goto out_gunlock;
+ error = 0;
if (alloc_required) {
struct gfs2_alloc *al = gfs2_alloc_get(dip);
if (error)
goto out_alloc;
- error = gfs2_quota_check(dip, dip->i_di.di_uid,
- dip->i_di.di_gid);
+ error = gfs2_quota_check(dip, dip->i_inode.i_uid, dip->i_inode.i_gid);
if (error)
goto out_gunlock_q;
if (error)
goto out_gunlock_q;
- error = gfs2_trans_begin(sdp,
- sdp->sd_max_dirres +
+ error = gfs2_trans_begin(sdp, sdp->sd_max_dirres +
al->al_rgd->rd_ri.ri_length +
2 * RES_DINODE + RES_STATFS +
RES_QUOTA, 0);
goto out_ipres;
}
- error = gfs2_dir_add(dip, &dentry->d_name, &ip->i_num,
- IF2DT(ip->i_di.di_mode));
+ error = gfs2_dir_add(dir, &dentry->d_name, &ip->i_num,
+ IF2DT(inode->i_mode));
if (error)
goto out_end_trans;
error = gfs2_change_nlink(ip, +1);
- out_end_trans:
+out_end_trans:
gfs2_trans_end(sdp);
-
- out_ipres:
+out_ipres:
if (alloc_required)
gfs2_inplace_release(dip);
-
- out_gunlock_q:
+out_gunlock_q:
if (alloc_required)
gfs2_quota_unlock(dip);
-
- out_alloc:
+out_alloc:
if (alloc_required)
gfs2_alloc_put(dip);
-
- out_gunlock:
+out_gunlock:
gfs2_glock_dq_m(2, ghs);
-
- out:
+out:
gfs2_holder_uninit(ghs);
gfs2_holder_uninit(ghs + 1);
-
if (!error) {
atomic_inc(&inode->i_count);
d_instantiate(dentry, inode);
mark_inode_dirty(inode);
}
-
return error;
}
static int gfs2_unlink(struct inode *dir, struct dentry *dentry)
{
- struct gfs2_inode *dip = get_v2ip(dir);
- struct gfs2_sbd *sdp = dip->i_sbd;
- struct gfs2_inode *ip = get_v2ip(dentry->d_inode);
- struct gfs2_unlinked *ul;
+ struct gfs2_inode *dip = GFS2_I(dir);
+ struct gfs2_sbd *sdp = GFS2_SB(dir);
+ struct gfs2_inode *ip = GFS2_I(dentry->d_inode);
struct gfs2_holder ghs[2];
int error;
- atomic_inc(&sdp->sd_ops_inode);
-
- error = gfs2_unlinked_get(sdp, &ul);
- if (error)
- return error;
-
gfs2_holder_init(dip->i_gl, LM_ST_EXCLUSIVE, 0, ghs);
gfs2_holder_init(ip->i_gl, LM_ST_EXCLUSIVE, 0, ghs + 1);
if (error)
goto out_gunlock;
- error = gfs2_trans_begin(sdp, 2 * RES_DINODE + RES_LEAF +
- RES_UNLINKED, 0);
+ error = gfs2_trans_begin(sdp, 2*RES_DINODE + RES_LEAF + RES_RG_BIT, 0);
if (error)
goto out_gunlock;
- error = gfs2_unlinki(dip, &dentry->d_name, ip,ul);
+ error = gfs2_dir_del(dip, &dentry->d_name);
+ if (error)
+ goto out_end_trans;
- gfs2_trans_end(sdp);
+ error = gfs2_change_nlink(ip, -1);
- out_gunlock:
+out_end_trans:
+ gfs2_trans_end(sdp);
+out_gunlock:
gfs2_glock_dq_m(2, ghs);
-
- out:
+out:
gfs2_holder_uninit(ghs);
gfs2_holder_uninit(ghs + 1);
-
- gfs2_unlinked_put(sdp, ul);
-
return error;
}
static int gfs2_symlink(struct inode *dir, struct dentry *dentry,
const char *symname)
{
- struct gfs2_inode *dip = get_v2ip(dir), *ip;
- struct gfs2_sbd *sdp = dip->i_sbd;
+ struct gfs2_inode *dip = GFS2_I(dir), *ip;
+ struct gfs2_sbd *sdp = GFS2_SB(dir);
struct gfs2_holder ghs[2];
struct inode *inode;
struct buffer_head *dibh;
int size;
int error;
- atomic_inc(&sdp->sd_ops_inode);
-
/* Must be stuffed with a null terminator for gfs2_follow_link() */
size = strlen(symname);
if (size > sdp->sd_sb.sb_bsize - sizeof(struct gfs2_dinode) - 1)
gfs2_holder_init(dip->i_gl, 0, 0, ghs);
- error = gfs2_createi(ghs, &dentry->d_name, S_IFLNK | S_IRWXUGO);
- if (error) {
+ inode = gfs2_createi(ghs, &dentry->d_name, S_IFLNK | S_IRWXUGO, 0);
+ if (IS_ERR(inode)) {
gfs2_holder_uninit(ghs);
- return error;
+ return PTR_ERR(inode);
}
- ip = get_gl2ip(ghs[1].gh_gl);
+ ip = ghs[1].gh_gl->gl_object;
ip->i_di.di_size = size;
error = gfs2_meta_inode_buffer(ip, &dibh);
if (!gfs2_assert_withdraw(sdp, !error)) {
- gfs2_dinode_out(&ip->i_di, dibh->b_data);
+ gfs2_dinode_out(ip, dibh->b_data);
memcpy(dibh->b_data + sizeof(struct gfs2_dinode), symname,
size);
brelse(dibh);
gfs2_glock_dq_uninit_m(2, ghs);
- inode = gfs2_ip2v(ip);
- gfs2_inode_put(ip);
-
- if (!inode)
- return -ENOMEM;
-
d_instantiate(dentry, inode);
mark_inode_dirty(inode);
static int gfs2_mkdir(struct inode *dir, struct dentry *dentry, int mode)
{
- struct gfs2_inode *dip = get_v2ip(dir), *ip;
- struct gfs2_sbd *sdp = dip->i_sbd;
+ struct gfs2_inode *dip = GFS2_I(dir), *ip;
+ struct gfs2_sbd *sdp = GFS2_SB(dir);
struct gfs2_holder ghs[2];
struct inode *inode;
struct buffer_head *dibh;
int error;
- atomic_inc(&sdp->sd_ops_inode);
-
gfs2_holder_init(dip->i_gl, 0, 0, ghs);
- error = gfs2_createi(ghs, &dentry->d_name, S_IFDIR | mode);
- if (error) {
+ inode = gfs2_createi(ghs, &dentry->d_name, S_IFDIR | mode, 0);
+ if (IS_ERR(inode)) {
gfs2_holder_uninit(ghs);
- return error;
+ return PTR_ERR(inode);
}
- ip = get_gl2ip(ghs[1].gh_gl);
+ ip = ghs[1].gh_gl->gl_object;
- ip->i_di.di_nlink = 2;
+ ip->i_inode.i_nlink = 2;
ip->i_di.di_size = sdp->sd_sb.sb_bsize - sizeof(struct gfs2_dinode);
ip->i_di.di_flags |= GFS2_DIF_JDATA;
- ip->i_di.di_payload_format = GFS2_FORMAT_DE;
ip->i_di.di_entries = 2;
error = gfs2_meta_inode_buffer(ip, &dibh);
if (!gfs2_assert_withdraw(sdp, !error)) {
struct gfs2_dinode *di = (struct gfs2_dinode *)dibh->b_data;
- struct gfs2_dirent *dent;
-
- gfs2_dirent_alloc(ip, dibh, 1, &dent);
+ struct gfs2_dirent *dent = (struct gfs2_dirent *)(di+1);
+ struct qstr str;
+ gfs2_str2qstr(&str, ".");
+ gfs2_trans_add_bh(ip->i_gl, dibh, 1);
+ gfs2_qstr2dirent(&str, GFS2_DIRENT_SIZE(str.len), dent);
dent->de_inum = di->di_num; /* already GFS2 endian */
- dent->de_hash = gfs2_disk_hash(".", 1);
- dent->de_hash = cpu_to_be32(dent->de_hash);
- dent->de_type = DT_DIR;
- memcpy((char *) (dent + 1), ".", 1);
+ dent->de_type = cpu_to_be16(DT_DIR);
di->di_entries = cpu_to_be32(1);
- gfs2_dirent_alloc(ip, dibh, 2, &dent);
+ gfs2_str2qstr(&str, "..");
+ dent = (struct gfs2_dirent *)((char*)dent + GFS2_DIRENT_SIZE(1));
+ gfs2_qstr2dirent(&str, dibh->b_size - GFS2_DIRENT_SIZE(1) - sizeof(struct gfs2_dinode), dent);
- gfs2_inum_out(&dip->i_num, (char *) &dent->de_inum);
- dent->de_hash = gfs2_disk_hash("..", 2);
- dent->de_hash = cpu_to_be32(dent->de_hash);
- dent->de_type = DT_DIR;
- memcpy((char *) (dent + 1), "..", 2);
+ gfs2_inum_out(&dip->i_num, &dent->de_inum);
+ dent->de_type = cpu_to_be16(DT_DIR);
- gfs2_dinode_out(&ip->i_di, (char *)di);
+ gfs2_dinode_out(ip, di);
brelse(dibh);
}
gfs2_glock_dq_uninit_m(2, ghs);
- inode = gfs2_ip2v(ip);
- gfs2_inode_put(ip);
-
- if (!inode)
- return -ENOMEM;
-
d_instantiate(dentry, inode);
mark_inode_dirty(inode);
static int gfs2_rmdir(struct inode *dir, struct dentry *dentry)
{
- struct gfs2_inode *dip = get_v2ip(dir);
- struct gfs2_sbd *sdp = dip->i_sbd;
- struct gfs2_inode *ip = get_v2ip(dentry->d_inode);
- struct gfs2_unlinked *ul;
+ struct gfs2_inode *dip = GFS2_I(dir);
+ struct gfs2_sbd *sdp = GFS2_SB(dir);
+ struct gfs2_inode *ip = GFS2_I(dentry->d_inode);
struct gfs2_holder ghs[2];
int error;
- atomic_inc(&sdp->sd_ops_inode);
-
- error = gfs2_unlinked_get(sdp, &ul);
- if (error)
- return error;
-
gfs2_holder_init(dip->i_gl, LM_ST_EXCLUSIVE, 0, ghs);
gfs2_holder_init(ip->i_gl, LM_ST_EXCLUSIVE, 0, ghs + 1);
if (ip->i_di.di_entries < 2) {
if (gfs2_consist_inode(ip))
- gfs2_dinode_print(&ip->i_di);
+ gfs2_dinode_print(ip);
error = -EIO;
goto out_gunlock;
}
goto out_gunlock;
}
- error = gfs2_trans_begin(sdp, 2 * RES_DINODE + 3 * RES_LEAF +
- RES_UNLINKED, 0);
+ error = gfs2_trans_begin(sdp, 2 * RES_DINODE + 3 * RES_LEAF + RES_RG_BIT, 0);
if (error)
goto out_gunlock;
- error = gfs2_rmdiri(dip, &dentry->d_name, ip, ul);
+ error = gfs2_rmdiri(dip, &dentry->d_name, ip);
gfs2_trans_end(sdp);
- out_gunlock:
+out_gunlock:
gfs2_glock_dq_m(2, ghs);
-
- out:
+out:
gfs2_holder_uninit(ghs);
gfs2_holder_uninit(ghs + 1);
-
- gfs2_unlinked_put(sdp, ul);
-
return error;
}
static int gfs2_mknod(struct inode *dir, struct dentry *dentry, int mode,
dev_t dev)
{
- struct gfs2_inode *dip = get_v2ip(dir), *ip;
- struct gfs2_sbd *sdp = dip->i_sbd;
+ struct gfs2_inode *dip = GFS2_I(dir);
+ struct gfs2_sbd *sdp = GFS2_SB(dir);
struct gfs2_holder ghs[2];
struct inode *inode;
- struct buffer_head *dibh;
- uint32_t major = 0, minor = 0;
- int error;
-
- atomic_inc(&sdp->sd_ops_inode);
-
- switch (mode & S_IFMT) {
- case S_IFBLK:
- case S_IFCHR:
- major = MAJOR(dev);
- minor = MINOR(dev);
- break;
- case S_IFIFO:
- case S_IFSOCK:
- break;
- default:
- return -EOPNOTSUPP;
- };
gfs2_holder_init(dip->i_gl, 0, 0, ghs);
- error = gfs2_createi(ghs, &dentry->d_name, mode);
- if (error) {
+ inode = gfs2_createi(ghs, &dentry->d_name, mode, dev);
+ if (IS_ERR(inode)) {
gfs2_holder_uninit(ghs);
- return error;
- }
-
- ip = get_gl2ip(ghs[1].gh_gl);
-
- ip->i_di.di_major = major;
- ip->i_di.di_minor = minor;
-
- error = gfs2_meta_inode_buffer(ip, &dibh);
-
- if (!gfs2_assert_withdraw(sdp, !error)) {
- gfs2_dinode_out(&ip->i_di, dibh->b_data);
- brelse(dibh);
+ return PTR_ERR(inode);
}
gfs2_trans_end(sdp);
gfs2_glock_dq_uninit_m(2, ghs);
- inode = gfs2_ip2v(ip);
- gfs2_inode_put(ip);
-
- if (!inode)
- return -ENOMEM;
-
d_instantiate(dentry, inode);
mark_inode_dirty(inode);
static int gfs2_rename(struct inode *odir, struct dentry *odentry,
struct inode *ndir, struct dentry *ndentry)
{
- struct gfs2_inode *odip = get_v2ip(odir);
- struct gfs2_inode *ndip = get_v2ip(ndir);
- struct gfs2_inode *ip = get_v2ip(odentry->d_inode);
+ struct gfs2_inode *odip = GFS2_I(odir);
+ struct gfs2_inode *ndip = GFS2_I(ndir);
+ struct gfs2_inode *ip = GFS2_I(odentry->d_inode);
struct gfs2_inode *nip = NULL;
- struct gfs2_sbd *sdp = odip->i_sbd;
- struct gfs2_unlinked *ul;
+ struct gfs2_sbd *sdp = GFS2_SB(odir);
struct gfs2_holder ghs[4], r_gh;
unsigned int num_gh;
int dir_rename = 0;
unsigned int x;
int error;
- atomic_inc(&sdp->sd_ops_inode);
-
if (ndentry->d_inode) {
- nip = get_v2ip(ndentry->d_inode);
+ nip = GFS2_I(ndentry->d_inode);
if (ip == nip)
return 0;
}
- error = gfs2_unlinked_get(sdp, &ul);
- if (error)
- return error;
-
/* Make sure we aren't trying to move a dirctory into it's subdir */
- if (S_ISDIR(ip->i_di.di_mode) && odip != ndip) {
+ if (S_ISDIR(ip->i_inode.i_mode) && odip != ndip) {
dir_rename = 1;
- error = gfs2_glock_nq_init(sdp->sd_rename_gl,
- LM_ST_EXCLUSIVE, 0,
+ error = gfs2_glock_nq_init(sdp->sd_rename_gl, LM_ST_EXCLUSIVE, 0,
&r_gh);
if (error)
goto out;
goto out_gunlock_r;
}
+ num_gh = 1;
gfs2_holder_init(odip->i_gl, LM_ST_EXCLUSIVE, 0, ghs);
- gfs2_holder_init(ndip->i_gl, LM_ST_EXCLUSIVE, 0, ghs + 1);
- gfs2_holder_init(ip->i_gl, LM_ST_EXCLUSIVE, 0, ghs + 2);
- num_gh = 3;
+ if (odip != ndip) {
+ gfs2_holder_init(ndip->i_gl, LM_ST_EXCLUSIVE, 0, ghs + num_gh);
+ num_gh++;
+ }
+ gfs2_holder_init(ip->i_gl, LM_ST_EXCLUSIVE, 0, ghs + num_gh);
+ num_gh++;
- if (nip)
- gfs2_holder_init(nip->i_gl, LM_ST_EXCLUSIVE, 0, ghs + num_gh++);
+ if (nip) {
+ gfs2_holder_init(nip->i_gl, LM_ST_EXCLUSIVE, 0, ghs + num_gh);
+ num_gh++;
+ }
error = gfs2_glock_nq_m(num_gh, ghs);
if (error)
if (error)
goto out_gunlock;
- if (S_ISDIR(nip->i_di.di_mode)) {
+ if (S_ISDIR(nip->i_inode.i_mode)) {
if (nip->i_di.di_entries < 2) {
if (gfs2_consist_inode(nip))
- gfs2_dinode_print(&nip->i_di);
+ gfs2_dinode_print(nip);
error = -EIO;
goto out_gunlock;
}
}
}
} else {
- error = gfs2_repermission(ndir, MAY_WRITE | MAY_EXEC, NULL);
+ error = permission(ndir, MAY_WRITE | MAY_EXEC, NULL);
if (error)
goto out_gunlock;
- error = gfs2_dir_search(ndip, &ndentry->d_name, NULL, NULL);
+ error = gfs2_dir_search(ndir, &ndentry->d_name, NULL, NULL);
switch (error) {
case -ENOENT:
error = 0;
};
if (odip != ndip) {
- if (!ndip->i_di.di_nlink) {
+ if (!ndip->i_inode.i_nlink) {
error = -EINVAL;
goto out_gunlock;
}
- if (ndip->i_di.di_entries == (uint32_t)-1) {
+ if (ndip->i_di.di_entries == (u32)-1) {
error = -EFBIG;
goto out_gunlock;
}
- if (S_ISDIR(ip->i_di.di_mode) &&
- ndip->i_di.di_nlink == (uint32_t)-1) {
+ if (S_ISDIR(ip->i_inode.i_mode) &&
+ ndip->i_inode.i_nlink == (u32)-1) {
error = -EMLINK;
goto out_gunlock;
}
/* Check out the dir to be renamed */
if (dir_rename) {
- error = gfs2_repermission(odentry->d_inode, MAY_WRITE, NULL);
+ error = permission(odentry->d_inode, MAY_WRITE, NULL);
if (error)
goto out_gunlock;
}
- error = gfs2_diradd_alloc_required(ndip, &ndentry->d_name,
- &alloc_required);
- if (error)
+ alloc_required = error = gfs2_diradd_alloc_required(ndir, &ndentry->d_name);
+ if (error < 0)
goto out_gunlock;
+ error = 0;
if (alloc_required) {
struct gfs2_alloc *al = gfs2_alloc_get(ndip);
if (error)
goto out_alloc;
- error = gfs2_quota_check(ndip, ndip->i_di.di_uid,
- ndip->i_di.di_gid);
+ error = gfs2_quota_check(ndip, ndip->i_inode.i_uid, ndip->i_inode.i_gid);
if (error)
goto out_gunlock_q;
if (error)
goto out_gunlock_q;
- error = gfs2_trans_begin(sdp,
- sdp->sd_max_dirres +
+ error = gfs2_trans_begin(sdp, sdp->sd_max_dirres +
al->al_rgd->rd_ri.ri_length +
4 * RES_DINODE + 4 * RES_LEAF +
- RES_UNLINKED + RES_STATFS +
- RES_QUOTA, 0);
+ RES_STATFS + RES_QUOTA, 0);
if (error)
goto out_ipreserv;
} else {
error = gfs2_trans_begin(sdp, 4 * RES_DINODE +
- 5 * RES_LEAF +
- RES_UNLINKED, 0);
+ 5 * RES_LEAF, 0);
if (error)
goto out_gunlock;
}
/* Remove the target file, if it exists */
if (nip) {
- if (S_ISDIR(nip->i_di.di_mode))
- error = gfs2_rmdiri(ndip, &ndentry->d_name, nip, ul);
- else
- error = gfs2_unlinki(ndip, &ndentry->d_name, nip, ul);
+ if (S_ISDIR(nip->i_inode.i_mode))
+ error = gfs2_rmdiri(ndip, &ndentry->d_name, nip);
+ else {
+ error = gfs2_dir_del(ndip, &ndentry->d_name);
+ if (error)
+ goto out_end_trans;
+ error = gfs2_change_nlink(nip, -1);
+ }
if (error)
goto out_end_trans;
}
if (dir_rename) {
struct qstr name;
- name.len = 2;
- name.name = "..";
+ gfs2_str2qstr(&name, "..");
error = gfs2_change_nlink(ndip, +1);
if (error)
error = gfs2_meta_inode_buffer(ip, &dibh);
if (error)
goto out_end_trans;
- ip->i_di.di_ctime = get_seconds();
- gfs2_trans_add_bh(ip->i_gl, dibh);
- gfs2_dinode_out(&ip->i_di, dibh->b_data);
+ ip->i_inode.i_ctime.tv_sec = get_seconds();
+ gfs2_trans_add_bh(ip->i_gl, dibh, 1);
+ gfs2_dinode_out(ip, dibh->b_data);
brelse(dibh);
}
if (error)
goto out_end_trans;
- error = gfs2_dir_add(ndip, &ndentry->d_name, &ip->i_num,
- IF2DT(ip->i_di.di_mode));
+ error = gfs2_dir_add(ndir, &ndentry->d_name, &ip->i_num,
+ IF2DT(ip->i_inode.i_mode));
if (error)
goto out_end_trans;
- out_end_trans:
+out_end_trans:
gfs2_trans_end(sdp);
-
- out_ipreserv:
+out_ipreserv:
if (alloc_required)
gfs2_inplace_release(ndip);
-
- out_gunlock_q:
+out_gunlock_q:
if (alloc_required)
gfs2_quota_unlock(ndip);
-
- out_alloc:
+out_alloc:
if (alloc_required)
gfs2_alloc_put(ndip);
-
- out_gunlock:
+out_gunlock:
gfs2_glock_dq_m(num_gh, ghs);
-
- out_uninit:
+out_uninit:
for (x = 0; x < num_gh; x++)
gfs2_holder_uninit(ghs + x);
-
- out_gunlock_r:
+out_gunlock_r:
if (dir_rename)
gfs2_glock_dq_uninit(&r_gh);
-
- out:
- gfs2_unlinked_put(sdp, ul);
-
+out:
return error;
}
static int gfs2_readlink(struct dentry *dentry, char __user *user_buf,
int user_size)
{
- struct gfs2_inode *ip = get_v2ip(dentry->d_inode);
+ struct gfs2_inode *ip = GFS2_I(dentry->d_inode);
char array[GFS2_FAST_NAME_SIZE], *buf = array;
unsigned int len = GFS2_FAST_NAME_SIZE;
int error;
- atomic_inc(&ip->i_sbd->sd_ops_inode);
-
error = gfs2_readlinki(ip, &buf, &len);
if (error)
return error;
static void *gfs2_follow_link(struct dentry *dentry, struct nameidata *nd)
{
- struct gfs2_inode *ip = get_v2ip(dentry->d_inode);
+ struct gfs2_inode *ip = GFS2_I(dentry->d_inode);
char array[GFS2_FAST_NAME_SIZE], *buf = array;
unsigned int len = GFS2_FAST_NAME_SIZE;
int error;
- atomic_inc(&ip->i_sbd->sd_ops_inode);
-
error = gfs2_readlinki(ip, &buf, &len);
if (!error) {
error = vfs_follow_link(nd, buf);
* @mask:
* @nd: passed from Linux VFS, ignored by us
*
+ * This may be called from the VFS directly, or from within GFS2 with the
+ * inode locked, so we look to see if the glock is already locked and only
+ * lock the glock if its not already been done.
+ *
* Returns: errno
*/
static int gfs2_permission(struct inode *inode, int mask, struct nameidata *nd)
{
- struct gfs2_inode *ip = get_v2ip(inode);
+ struct gfs2_inode *ip = GFS2_I(inode);
struct gfs2_holder i_gh;
int error;
+ int unlock = 0;
- atomic_inc(&ip->i_sbd->sd_ops_inode);
-
- if (ip->i_vn == ip->i_gl->gl_vn)
- return generic_permission(inode, mask, gfs2_check_acl);
+ if (gfs2_glock_is_locked_by_me(ip->i_gl) == 0) {
+ error = gfs2_glock_nq_init(ip->i_gl, LM_ST_SHARED, LM_FLAG_ANY, &i_gh);
+ if (error)
+ return error;
+ unlock = 1;
+ }
- error = gfs2_glock_nq_init(ip->i_gl,
- LM_ST_SHARED, LM_FLAG_ANY,
- &i_gh);
- if (!error) {
- error = generic_permission(inode, mask, gfs2_check_acl_locked);
+ error = generic_permission(inode, mask, gfs2_check_acl_locked);
+ if (unlock)
gfs2_glock_dq_uninit(&i_gh);
- }
return error;
}
static int setattr_size(struct inode *inode, struct iattr *attr)
{
- struct gfs2_inode *ip = get_v2ip(inode);
+ struct gfs2_inode *ip = GFS2_I(inode);
int error;
if (attr->ia_size != ip->i_di.di_size) {
return error;
}
- error = gfs2_truncatei(ip, attr->ia_size, gfs2_truncator_page);
+ error = gfs2_truncatei(ip, attr->ia_size);
if (error)
return error;
static int setattr_chown(struct inode *inode, struct iattr *attr)
{
- struct gfs2_inode *ip = get_v2ip(inode);
- struct gfs2_sbd *sdp = ip->i_sbd;
+ struct gfs2_inode *ip = GFS2_I(inode);
+ struct gfs2_sbd *sdp = GFS2_SB(inode);
struct buffer_head *dibh;
- uint32_t ouid, ogid, nuid, ngid;
+ u32 ouid, ogid, nuid, ngid;
int error;
- ouid = ip->i_di.di_uid;
- ogid = ip->i_di.di_gid;
+ ouid = inode->i_uid;
+ ogid = inode->i_gid;
nuid = attr->ia_uid;
ngid = attr->ia_gid;
error = inode_setattr(inode, attr);
gfs2_assert_warn(sdp, !error);
- gfs2_inode_attr_out(ip);
- gfs2_trans_add_bh(ip->i_gl, dibh);
- gfs2_dinode_out(&ip->i_di, dibh->b_data);
+ gfs2_trans_add_bh(ip->i_gl, dibh, 1);
+ gfs2_dinode_out(ip, dibh->b_data);
brelse(dibh);
if (ouid != NO_QUOTA_CHANGE || ogid != NO_QUOTA_CHANGE) {
- gfs2_quota_change(ip, -ip->i_di.di_blocks,
- ouid, ogid);
- gfs2_quota_change(ip, ip->i_di.di_blocks,
- nuid, ngid);
+ gfs2_quota_change(ip, -ip->i_di.di_blocks, ouid, ogid);
+ gfs2_quota_change(ip, ip->i_di.di_blocks, nuid, ngid);
}
- out_end_trans:
+out_end_trans:
gfs2_trans_end(sdp);
-
- out_gunlock_q:
+out_gunlock_q:
gfs2_quota_unlock(ip);
-
- out_alloc:
+out_alloc:
gfs2_alloc_put(ip);
-
return error;
}
static int gfs2_setattr(struct dentry *dentry, struct iattr *attr)
{
struct inode *inode = dentry->d_inode;
- struct gfs2_inode *ip = get_v2ip(inode);
+ struct gfs2_inode *ip = GFS2_I(inode);
struct gfs2_holder i_gh;
int error;
- atomic_inc(&ip->i_sbd->sd_ops_inode);
-
error = gfs2_glock_nq_init(ip->i_gl, LM_ST_EXCLUSIVE, 0, &i_gh);
if (error)
return error;
else
error = gfs2_setattr_simple(ip, attr);
- out:
+out:
gfs2_glock_dq_uninit(&i_gh);
-
if (!error)
mark_inode_dirty(inode);
-
return error;
}
/**
* gfs2_getattr - Read out an inode's attributes
- * @mnt: ?
+ * @mnt: The vfsmount the inode is being accessed from
* @dentry: The dentry to stat
* @stat: The inode's stats
*
struct kstat *stat)
{
struct inode *inode = dentry->d_inode;
- struct gfs2_inode *ip = get_v2ip(inode);
+ struct gfs2_inode *ip = GFS2_I(inode);
struct gfs2_holder gh;
int error;
- atomic_inc(&ip->i_sbd->sd_ops_inode);
-
error = gfs2_glock_nq_init(ip->i_gl, LM_ST_SHARED, LM_FLAG_ANY, &gh);
if (!error) {
generic_fillattr(inode, stat);
static int gfs2_setxattr(struct dentry *dentry, const char *name,
const void *data, size_t size, int flags)
{
- struct gfs2_inode *ip = get_v2ip(dentry->d_inode);
+ struct inode *inode = dentry->d_inode;
struct gfs2_ea_request er;
- atomic_inc(&ip->i_sbd->sd_ops_inode);
-
memset(&er, 0, sizeof(struct gfs2_ea_request));
er.er_type = gfs2_ea_name2type(name, &er.er_name);
if (er.er_type == GFS2_EATYPE_UNUSED)
er.er_data_len = size;
er.er_flags = flags;
- gfs2_assert_warn(ip->i_sbd, !(er.er_flags & GFS2_ERF_MODE));
+ gfs2_assert_warn(GFS2_SB(inode), !(er.er_flags & GFS2_ERF_MODE));
- return gfs2_ea_set(ip, &er);
+ return gfs2_ea_set(GFS2_I(inode), &er);
}
static ssize_t gfs2_getxattr(struct dentry *dentry, const char *name,
{
struct gfs2_ea_request er;
- atomic_inc(&get_v2sdp(dentry->d_inode->i_sb)->sd_ops_inode);
-
memset(&er, 0, sizeof(struct gfs2_ea_request));
er.er_type = gfs2_ea_name2type(name, &er.er_name);
if (er.er_type == GFS2_EATYPE_UNUSED)
er.er_name_len = strlen(er.er_name);
er.er_data_len = size;
- return gfs2_ea_get(get_v2ip(dentry->d_inode), &er);
+ return gfs2_ea_get(GFS2_I(dentry->d_inode), &er);
}
static ssize_t gfs2_listxattr(struct dentry *dentry, char *buffer, size_t size)
{
struct gfs2_ea_request er;
- atomic_inc(&get_v2sdp(dentry->d_inode->i_sb)->sd_ops_inode);
-
memset(&er, 0, sizeof(struct gfs2_ea_request));
er.er_data = (size) ? buffer : NULL;
er.er_data_len = size;
- return gfs2_ea_list(get_v2ip(dentry->d_inode), &er);
+ return gfs2_ea_list(GFS2_I(dentry->d_inode), &er);
}
static int gfs2_removexattr(struct dentry *dentry, const char *name)
{
struct gfs2_ea_request er;
- atomic_inc(&get_v2sdp(dentry->d_inode->i_sb)->sd_ops_inode);
-
memset(&er, 0, sizeof(struct gfs2_ea_request));
er.er_type = gfs2_ea_name2type(name, &er.er_name);
if (er.er_type == GFS2_EATYPE_UNUSED)
return -EOPNOTSUPP;
er.er_name_len = strlen(er.er_name);
- return gfs2_ea_remove(get_v2ip(dentry->d_inode), &er);
+ return gfs2_ea_remove(GFS2_I(dentry->d_inode), &er);
}
struct inode_operations gfs2_file_iops = {
projects / linux-block.git / blobdiff