#include <linux/mm.h>
#include <linux/xattr.h>
#include <linux/posix_acl.h>
+#include <linux/gfs2_ondisk.h>
+#include <linux/crc32.h>
#include <asm/semaphore.h>
#include <asm/uaccess.h>
#include "gfs2.h"
+#include "lm_interface.h"
+#include "incore.h"
#include "acl.h"
#include "bmap.h"
#include "dir.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_inode *dip = dir->u.generic_ip;
struct gfs2_sbd *sdp = dip->i_sbd;
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);
+ if (!IS_ERR(inode)) {
gfs2_trans_end(sdp);
if (dip->i_alloc.al_rgd)
gfs2_inplace_release(dip);
gfs2_alloc_put(dip);
gfs2_glock_dq_uninit_m(2, ghs);
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)) {
+ new = 0;
+ 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);
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;
- 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);
+ dentry->d_op = &gfs2_dops;
- } 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_inode *dip = dir->u.generic_ip;
struct gfs2_sbd *sdp = dip->i_sbd;
struct inode *inode = old_dentry->d_inode;
- struct gfs2_inode *ip = get_v2ip(inode);
+ struct gfs2_inode *ip = inode->u.generic_ip;
struct gfs2_holder ghs[2];
int alloc_required;
int error;
- atomic_inc(&sdp->sd_ops_inode);
-
if (S_ISDIR(ip->i_di.di_mode))
return -EPERM;
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;
if (ip->i_di.di_nlink == (uint32_t)-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);
goto out_ipres;
}
- error = gfs2_dir_add(dip, &dentry->d_name, &ip->i_num,
+ error = gfs2_dir_add(dir, &dentry->d_name, &ip->i_num,
IF2DT(ip->i_di.di_mode));
if (error)
goto out_end_trans;
static int gfs2_unlink(struct inode *dir, struct dentry *dentry)
{
- struct gfs2_inode *dip = get_v2ip(dir);
+ struct gfs2_inode *dip = dir->u.generic_ip;
struct gfs2_sbd *sdp = dip->i_sbd;
- struct gfs2_inode *ip = get_v2ip(dentry->d_inode);
+ struct gfs2_inode *ip = dentry->d_inode->u.generic_ip;
struct gfs2_unlinked *ul;
struct gfs2_holder ghs[2];
int error;
- atomic_inc(&sdp->sd_ops_inode);
-
error = gfs2_unlinked_get(sdp, &ul);
if (error)
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_inode *dip = dir->u.generic_ip, *ip;
struct gfs2_sbd *sdp = dip->i_sbd;
struct gfs2_holder ghs[2];
struct inode *inode;
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);
+ 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;
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_inode *dip = dir->u.generic_ip, *ip;
struct gfs2_sbd *sdp = dip->i_sbd;
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);
+ 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_di.di_size = sdp->sd_sb.sb_bsize - sizeof(struct gfs2_dinode);
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);
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_dinode_out(&ip->i_di, (char *)di);
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_inode *dip = dir->u.generic_ip;
struct gfs2_sbd *sdp = dip->i_sbd;
- struct gfs2_inode *ip = get_v2ip(dentry->d_inode);
+ struct gfs2_inode *ip = dentry->d_inode->u.generic_ip;
struct gfs2_unlinked *ul;
struct gfs2_holder ghs[2];
int error;
- atomic_inc(&sdp->sd_ops_inode);
-
error = gfs2_unlinked_get(sdp, &ul);
if (error)
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_inode *dip = dir->u.generic_ip, *ip;
struct gfs2_sbd *sdp = dip->i_sbd;
struct gfs2_holder ghs[2];
struct inode *inode;
uint32_t major = 0, minor = 0;
int error;
- atomic_inc(&sdp->sd_ops_inode);
-
switch (mode & S_IFMT) {
case S_IFBLK:
case S_IFCHR:
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);
+ 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_major = major;
ip->i_di.di_minor = minor;
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 = odir->u.generic_ip;
+ struct gfs2_inode *ndip = ndir->u.generic_ip;
+ struct gfs2_inode *ip = odentry->d_inode->u.generic_ip;
struct gfs2_inode *nip = NULL;
struct gfs2_sbd *sdp = odip->i_sbd;
struct gfs2_unlinked *ul;
unsigned int x;
int error;
- atomic_inc(&sdp->sd_ops_inode);
-
if (ndentry->d_inode) {
- nip = get_v2ip(ndentry->d_inode);
+ nip = ndentry->d_inode->u.generic_ip;
if (ip == nip)
return 0;
}
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;
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 (dir_rename) {
struct qstr name;
- name.len = 2;
- name.name = "..";
+ gfs2_str2qstr(&name, "..");
error = gfs2_change_nlink(ndip, +1);
if (error)
if (error)
goto out_end_trans;
- error = gfs2_dir_add(ndip, &ndentry->d_name, &ip->i_num,
+ error = gfs2_dir_add(ndir, &ndentry->d_name, &ip->i_num,
IF2DT(ip->i_di.di_mode));
if (error)
goto out_end_trans;
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 = dentry->d_inode->u.generic_ip;
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 = dentry->d_inode->u.generic_ip;
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);
static int gfs2_permission(struct inode *inode, int mask, struct nameidata *nd)
{
- struct gfs2_inode *ip = get_v2ip(inode);
+ struct gfs2_inode *ip = inode->u.generic_ip;
struct gfs2_holder i_gh;
int error;
- 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);
static int setattr_size(struct inode *inode, struct iattr *attr)
{
- struct gfs2_inode *ip = get_v2ip(inode);
+ struct gfs2_inode *ip = inode->u.generic_ip;
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_inode *ip = inode->u.generic_ip;
struct gfs2_sbd *sdp = ip->i_sbd;
struct buffer_head *dibh;
uint32_t ouid, ogid, nuid, ngid;
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 = inode->u.generic_ip;
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;
struct kstat *stat)
{
struct inode *inode = dentry->d_inode;
- struct gfs2_inode *ip = get_v2ip(inode);
+ struct gfs2_inode *ip = inode->u.generic_ip;
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 gfs2_inode *ip = dentry->d_inode->u.generic_ip;
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)
{
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(dentry->d_inode->u.generic_ip, &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(dentry->d_inode->u.generic_ip, &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(dentry->d_inode->u.generic_ip, &er);
}
struct inode_operations gfs2_file_iops = {
projects / powerpc.git / blobdiff