Skip to content

L
linux
Commit 993386c1 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Tim Shimmin
Browse files
Options

[XFS] decontaminate vnode operations from behavior details 

All vnode ops now take struct xfs_inode pointers and the behaviour related
glue is split out into methods of it's own. This required fixing
xfs_create/mkdir/symlink to not mess with the inode pointer but rather use
a separate boolean for error handling. Thanks to Dave Chinner for that
fix.

SGI-PV: 969608
SGI-Modid: xfs-linux-melb:xfs-kern:29492a
Signed-off-by: default avatarChristoph Hellwig <hch@infradead.org>
Signed-off-by: default avatarDavid Chinner <dgc@sgi.com>
Signed-off-by: default avatarTim Shimmin <tes@sgi.com>
parent b93bd20c
Hide whitespace changes
Inline Side-by-side
Showing with 765 additions and 466 deletions
fs/xfs/Makefile-linux-2.6
View file @ 993386c1
...@@ -89,6 +89,7 @@ xfs-y += xfs_alloc.o \ ...@@ -89,6 +89,7 @@ xfs-y += xfs_alloc.o \
xfs_utils.o \ xfs_utils.o \
xfs_vfsops.o \ xfs_vfsops.o \
xfs_vnodeops.o \ xfs_vnodeops.o \
xfs_vnodeops_bhv.o \
xfs_rw.o \ xfs_rw.o \
xfs_dmops.o \ xfs_dmops.o \
xfs_qmops.o xfs_qmops.o
......
fs/xfs/linux-2.6/xfs_fs_subr.c
View file @ 993386c1
...@@ -16,66 +16,80 @@ ...@@ -16,66 +16,80 @@
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "xfs.h" #include "xfs.h"
#include "xfs_vnodeops.h"
/*
* The following six includes are needed so that we can include
* xfs_inode.h. What a mess..
*/
#include "xfs_bmap_btree.h"
#include "xfs_inum.h"
#include "xfs_dir2.h"
#include "xfs_dir2_sf.h"
#include "xfs_attr_sf.h"
#include "xfs_dinode.h"
#include "xfs_inode.h"
int fs_noerr(void) { return 0; } int fs_noerr(void) { return 0; }
int fs_nosys(void) { return ENOSYS; } int fs_nosys(void) { return ENOSYS; }
void fs_noval(void) { return; } void fs_noval(void) { return; }
void void
fs_tosspages( xfs_tosspages(
bhv_desc_t *bdp, xfs_inode_t *ip,
xfs_off_t first, xfs_off_t first,
xfs_off_t last, xfs_off_t last,
int fiopt) int fiopt)
{ {
bhv_vnode_t *vp = BHV_TO_VNODE(bdp); bhv_vnode_t *vp = XFS_ITOV(ip);
struct inode *ip = vn_to_inode(vp); struct inode *inode = vn_to_inode(vp);
if (VN_CACHED(vp)) if (VN_CACHED(vp))
truncate_inode_pages(ip->i_mapping, first); truncate_inode_pages(inode->i_mapping, first);
} }
int int
fs_flushinval_pages( xfs_flushinval_pages(
bhv_desc_t *bdp, xfs_inode_t *ip,
xfs_off_t first, xfs_off_t first,
xfs_off_t last, xfs_off_t last,
int fiopt) int fiopt)
{ {
bhv_vnode_t *vp = BHV_TO_VNODE(bdp); bhv_vnode_t *vp = XFS_ITOV(ip);
struct inode *ip = vn_to_inode(vp); struct inode *inode = vn_to_inode(vp);
int ret = 0; int ret = 0;
if (VN_CACHED(vp)) { if (VN_CACHED(vp)) {
if (VN_TRUNC(vp)) if (VN_TRUNC(vp))
VUNTRUNCATE(vp); VUNTRUNCATE(vp);
ret = filemap_write_and_wait(ip->i_mapping); ret = filemap_write_and_wait(inode->i_mapping);
if (!ret) if (!ret)
truncate_inode_pages(ip->i_mapping, first); truncate_inode_pages(inode->i_mapping, first);
} }
return ret; return ret;
} }
int int
fs_flush_pages( xfs_flush_pages(
bhv_desc_t *bdp, xfs_inode_t *ip,
xfs_off_t first, xfs_off_t first,
xfs_off_t last, xfs_off_t last,
uint64_t flags, uint64_t flags,
int fiopt) int fiopt)
{ {
bhv_vnode_t *vp = BHV_TO_VNODE(bdp); bhv_vnode_t *vp = XFS_ITOV(ip);
struct inode *ip = vn_to_inode(vp); struct inode *inode = vn_to_inode(vp);
int ret = 0; int ret = 0;
int ret2; int ret2;
if (VN_DIRTY(vp)) { if (VN_DIRTY(vp)) {
if (VN_TRUNC(vp)) if (VN_TRUNC(vp))
VUNTRUNCATE(vp); VUNTRUNCATE(vp);
ret = filemap_fdatawrite(ip->i_mapping); ret = filemap_fdatawrite(inode->i_mapping);
if (flags & XFS_B_ASYNC) if (flags & XFS_B_ASYNC)
return ret; return ret;
ret2 = filemap_fdatawait(ip->i_mapping); ret2 = filemap_fdatawait(inode->i_mapping);
if (!ret) if (!ret)
ret = ret2; ret = ret2;
} }
......
fs/xfs/linux-2.6/xfs_fs_subr.h
View file @ 993386c1
...@@ -18,12 +18,8 @@ ...@@ -18,12 +18,8 @@
#ifndef __XFS_FS_SUBR_H__ #ifndef __XFS_FS_SUBR_H__
#define __XFS_FS_SUBR_H__ #define __XFS_FS_SUBR_H__
struct cred;
extern int fs_noerr(void); extern int fs_noerr(void);
extern int fs_nosys(void); extern int fs_nosys(void);
extern void fs_noval(void); extern void fs_noval(void);
extern void fs_tosspages(bhv_desc_t *, xfs_off_t, xfs_off_t, int);
extern int fs_flushinval_pages(bhv_desc_t *, xfs_off_t, xfs_off_t, int);
extern int fs_flush_pages(bhv_desc_t *, xfs_off_t, xfs_off_t, uint64_t, int);
#endif /* __XFS_FS_SUBR_H__ */ #endif /* __XFS_FS_SUBR_H__ */
fs/xfs/linux-2.6/xfs_ioctl.c
View file @ 993386c1
...@@ -47,6 +47,7 @@ ...@@ -47,6 +47,7 @@
#include "xfs_utils.h" #include "xfs_utils.h"
#include "xfs_dfrag.h" #include "xfs_dfrag.h"
#include "xfs_fsops.h" #include "xfs_fsops.h"
#include "xfs_vnodeops.h"
#include <linux/capability.h> #include <linux/capability.h>
#include <linux/dcache.h> #include <linux/dcache.h>
...@@ -436,7 +437,6 @@ xfs_fssetdm_by_handle( ...@@ -436,7 +437,6 @@ xfs_fssetdm_by_handle(
struct fsdmidata fsd; struct fsdmidata fsd;
xfs_fsop_setdm_handlereq_t dmhreq; xfs_fsop_setdm_handlereq_t dmhreq;
struct inode *inode; struct inode *inode;
bhv_desc_t *bdp;
bhv_vnode_t *vp; bhv_vnode_t *vp;
if (!capable(CAP_MKNOD)) if (!capable(CAP_MKNOD))
...@@ -458,8 +458,8 @@ xfs_fssetdm_by_handle( ...@@ -458,8 +458,8 @@ xfs_fssetdm_by_handle(
return -XFS_ERROR(EFAULT); return -XFS_ERROR(EFAULT);
} }
bdp = bhv_base_unlocked(VN_BHV_HEAD(vp)); error = xfs_set_dmattrs(xfs_vtoi(vp),
error = xfs_set_dmattrs(bdp, fsd.fsd_dmevmask, fsd.fsd_dmstate, NULL); fsd.fsd_dmevmask, fsd.fsd_dmstate);
VN_RELE(vp); VN_RELE(vp);
if (error) if (error)
...@@ -676,7 +676,7 @@ xfs_attrmulti_by_handle( ...@@ -676,7 +676,7 @@ xfs_attrmulti_by_handle(
STATIC int STATIC int
xfs_ioc_space( xfs_ioc_space(
bhv_desc_t *bdp, struct xfs_inode *ip,
struct inode *inode, struct inode *inode,
struct file *filp, struct file *filp,
int flags, int flags,
...@@ -709,37 +709,31 @@ xfs_ioc_xattr( ...@@ -709,37 +709,31 @@ xfs_ioc_xattr(
STATIC int STATIC int
xfs_ioc_getbmap( xfs_ioc_getbmap(
bhv_desc_t *bdp, struct xfs_inode *ip,
int flags, int flags,
unsigned int cmd, unsigned int cmd,
void __user *arg); void __user *arg);
STATIC int STATIC int
xfs_ioc_getbmapx( xfs_ioc_getbmapx(
bhv_desc_t *bdp, struct xfs_inode *ip,
void __user *arg); void __user *arg);
int int
xfs_ioctl( xfs_ioctl(
bhv_desc_t *bdp, xfs_inode_t *ip,
struct inode *inode,
struct file *filp, struct file *filp,
int ioflags, int ioflags,
unsigned int cmd, unsigned int cmd,
void __user *arg) void __user *arg)
{ {
struct inode *inode = filp->f_path.dentry->d_inode;
bhv_vnode_t *vp = vn_from_inode(inode);
xfs_mount_t *mp = ip->i_mount;
int error; int error;
bhv_vnode_t *vp;
xfs_inode_t *ip;
xfs_mount_t *mp;
vp = vn_from_inode(inode);
vn_trace_entry(vp, "xfs_ioctl", (inst_t *)__return_address); vn_trace_entry(vp, "xfs_ioctl", (inst_t *)__return_address);
ip = XFS_BHVTOI(bdp);
mp = ip->i_mount;
switch (cmd) { switch (cmd) {
case XFS_IOC_ALLOCSP: case XFS_IOC_ALLOCSP:
...@@ -758,7 +752,7 @@ xfs_ioctl( ...@@ -758,7 +752,7 @@ xfs_ioctl(
!capable(CAP_SYS_ADMIN)) !capable(CAP_SYS_ADMIN))
return -EPERM; return -EPERM;
return xfs_ioc_space(bdp, inode, filp, ioflags, cmd, arg); return xfs_ioc_space(ip, inode, filp, ioflags, cmd, arg);
case XFS_IOC_DIOINFO: { case XFS_IOC_DIOINFO: {
struct dioattr da; struct dioattr da;
...@@ -801,17 +795,17 @@ xfs_ioctl( ...@@ -801,17 +795,17 @@ xfs_ioctl(
if (copy_from_user(&dmi, arg, sizeof(dmi))) if (copy_from_user(&dmi, arg, sizeof(dmi)))
return -XFS_ERROR(EFAULT); return -XFS_ERROR(EFAULT);
error = xfs_set_dmattrs(bdp, dmi.fsd_dmevmask, dmi.fsd_dmstate, error = xfs_set_dmattrs(ip, dmi.fsd_dmevmask,
NULL); dmi.fsd_dmstate);
return -error; return -error;
} }
case XFS_IOC_GETBMAP: case XFS_IOC_GETBMAP:
case XFS_IOC_GETBMAPA: case XFS_IOC_GETBMAPA:
return xfs_ioc_getbmap(bdp, ioflags, cmd, arg); return xfs_ioc_getbmap(ip, ioflags, cmd, arg);
case XFS_IOC_GETBMAPX: case XFS_IOC_GETBMAPX:
return xfs_ioc_getbmapx(bdp, arg); return xfs_ioc_getbmapx(ip, arg);
case XFS_IOC_FD_TO_HANDLE: case XFS_IOC_FD_TO_HANDLE:
case XFS_IOC_PATH_TO_HANDLE: case XFS_IOC_PATH_TO_HANDLE:
...@@ -981,7 +975,7 @@ xfs_ioctl( ...@@ -981,7 +975,7 @@ xfs_ioctl(
STATIC int STATIC int
xfs_ioc_space( xfs_ioc_space(
bhv_desc_t *bdp, struct xfs_inode *ip,
struct inode *inode, struct inode *inode,
struct file *filp, struct file *filp,
int ioflags, int ioflags,
...@@ -1009,7 +1003,7 @@ xfs_ioc_space( ...@@ -1009,7 +1003,7 @@ xfs_ioc_space(
if (ioflags & IO_INVIS) if (ioflags & IO_INVIS)
attr_flags |= ATTR_DMI; attr_flags |= ATTR_DMI;
error = xfs_change_file_space(bdp, cmd, &bf, filp->f_pos, error = xfs_change_file_space(ip, cmd, &bf, filp->f_pos,
NULL, attr_flags); NULL, attr_flags);
return -error; return -error;
} }
...@@ -1295,7 +1289,7 @@ xfs_ioc_xattr( ...@@ -1295,7 +1289,7 @@ xfs_ioc_xattr(
STATIC int STATIC int
xfs_ioc_getbmap( xfs_ioc_getbmap(
bhv_desc_t *bdp, struct xfs_inode *ip,
int ioflags, int ioflags,
unsigned int cmd, unsigned int cmd,
void __user *arg) void __user *arg)
...@@ -1314,7 +1308,7 @@ xfs_ioc_getbmap( ...@@ -1314,7 +1308,7 @@ xfs_ioc_getbmap(
if (ioflags & IO_INVIS) if (ioflags & IO_INVIS)
iflags |= BMV_IF_NO_DMAPI_READ; iflags |= BMV_IF_NO_DMAPI_READ;
error = xfs_getbmap(bdp, &bm, (struct getbmap __user *)arg+1, iflags); error = xfs_getbmap(ip, &bm, (struct getbmap __user *)arg+1, iflags);
if (error) if (error)
return -error; return -error;
...@@ -1325,7 +1319,7 @@ xfs_ioc_getbmap( ...@@ -1325,7 +1319,7 @@ xfs_ioc_getbmap(
STATIC int STATIC int
xfs_ioc_getbmapx( xfs_ioc_getbmapx(
bhv_desc_t *bdp, struct xfs_inode *ip,
void __user *arg) void __user *arg)
{ {
struct getbmapx bmx; struct getbmapx bmx;
...@@ -1352,7 +1346,7 @@ xfs_ioc_getbmapx( ...@@ -1352,7 +1346,7 @@ xfs_ioc_getbmapx(
iflags |= BMV_IF_EXTENDED; iflags |= BMV_IF_EXTENDED;
error = xfs_getbmap(bdp, &bm, (struct getbmapx __user *)arg+1, iflags); error = xfs_getbmap(ip, &bm, (struct getbmapx __user *)arg+1, iflags);
if (error) if (error)
return -error; return -error;
......
fs/xfs/linux-2.6/xfs_iops.h
View file @ 993386c1
...@@ -26,8 +26,6 @@ extern const struct file_operations xfs_file_operations; ...@@ -26,8 +26,6 @@ extern const struct file_operations xfs_file_operations;
extern const struct file_operations xfs_dir_file_operations; extern const struct file_operations xfs_dir_file_operations;
extern const struct file_operations xfs_invis_file_operations; extern const struct file_operations xfs_invis_file_operations;
extern int xfs_ioctl(struct bhv_desc *, struct inode *, struct file *,
int, unsigned int, void __user *);
struct xfs_inode; struct xfs_inode;
extern void xfs_ichgtime(struct xfs_inode *, int); extern void xfs_ichgtime(struct xfs_inode *, int);
......
fs/xfs/linux-2.6/xfs_lrw.c
View file @ 993386c1
...@@ -48,6 +48,7 @@ ...@@ -48,6 +48,7 @@
#include "xfs_buf_item.h" #include "xfs_buf_item.h"
#include "xfs_utils.h" #include "xfs_utils.h"
#include "xfs_iomap.h" #include "xfs_iomap.h"
#include "xfs_vnodeops.h"
#include <linux/capability.h> #include <linux/capability.h>
#include <linux/writeback.h> #include <linux/writeback.h>
...@@ -180,27 +181,22 @@ xfs_iozero( ...@@ -180,27 +181,22 @@ xfs_iozero(
ssize_t /* bytes read, or (-) error */ ssize_t /* bytes read, or (-) error */
xfs_read( xfs_read(
bhv_desc_t *bdp, xfs_inode_t *ip,
struct kiocb *iocb, struct kiocb *iocb,
const struct iovec *iovp, const struct iovec *iovp,
unsigned int segs, unsigned int segs,
loff_t *offset, loff_t *offset,
int ioflags, int ioflags)
cred_t *credp)
{ {
struct file *file = iocb->ki_filp; struct file *file = iocb->ki_filp;
struct inode *inode = file->f_mapping->host; struct inode *inode = file->f_mapping->host;
bhv_vnode_t *vp = XFS_ITOV(ip);
xfs_mount_t *mp = ip->i_mount;
size_t size = 0; size_t size = 0;
ssize_t ret = 0; ssize_t ret = 0;
xfs_fsize_t n; xfs_fsize_t n;
xfs_inode_t *ip;
xfs_mount_t *mp;
bhv_vnode_t *vp;
unsigned long seg; unsigned long seg;
ip = XFS_BHVTOI(bdp);
vp = BHV_TO_VNODE(bdp);
mp = ip->i_mount;
XFS_STATS_INC(xs_read_calls); XFS_STATS_INC(xs_read_calls);
...@@ -249,8 +245,7 @@ xfs_read( ...@@ -249,8 +245,7 @@ xfs_read(
bhv_vrwlock_t locktype = VRWLOCK_READ; bhv_vrwlock_t locktype = VRWLOCK_READ;
int dmflags = FILP_DELAY_FLAG(file) | DM_SEM_FLAG_RD(ioflags); int dmflags = FILP_DELAY_FLAG(file) | DM_SEM_FLAG_RD(ioflags);
ret = -XFS_SEND_DATA(mp, DM_EVENT_READ, ret = -XFS_SEND_DATA(mp, DM_EVENT_READ, vp, *offset, size,
BHV_TO_VNODE(bdp), *offset, size,
dmflags, &locktype); dmflags, &locktype);
if (ret) { if (ret) {
xfs_iunlock(ip, XFS_IOLOCK_SHARED); xfs_iunlock(ip, XFS_IOLOCK_SHARED);
...@@ -287,16 +282,15 @@ xfs_read( ...@@ -287,16 +282,15 @@ xfs_read(
ssize_t ssize_t
xfs_splice_read( xfs_splice_read(
bhv_desc_t *bdp, xfs_inode_t *ip,
struct file *infilp, struct file *infilp,
loff_t *ppos, loff_t *ppos,
struct pipe_inode_info *pipe, struct pipe_inode_info *pipe,
size_t count, size_t count,
int flags, int flags,
int ioflags, int ioflags)
cred_t *credp)
{ {
xfs_inode_t *ip = XFS_BHVTOI(bdp); bhv_vnode_t *vp = XFS_ITOV(ip);
xfs_mount_t *mp = ip->i_mount; xfs_mount_t *mp = ip->i_mount;
ssize_t ret; ssize_t ret;
...@@ -310,8 +304,7 @@ xfs_splice_read( ...@@ -310,8 +304,7 @@ xfs_splice_read(
bhv_vrwlock_t locktype = VRWLOCK_READ; bhv_vrwlock_t locktype = VRWLOCK_READ;
int error; int error;
error = XFS_SEND_DATA(mp, DM_EVENT_READ, BHV_TO_VNODE(bdp), error = XFS_SEND_DATA(mp, DM_EVENT_READ, vp, *ppos, count,
*ppos, count,
FILP_DELAY_FLAG(infilp), &locktype); FILP_DELAY_FLAG(infilp), &locktype);
if (error) { if (error) {
xfs_iunlock(ip, XFS_IOLOCK_SHARED); xfs_iunlock(ip, XFS_IOLOCK_SHARED);
...@@ -330,16 +323,15 @@ xfs_splice_read( ...@@ -330,16 +323,15 @@ xfs_splice_read(
ssize_t ssize_t
xfs_splice_write( xfs_splice_write(
bhv_desc_t *bdp, xfs_inode_t *ip,
struct pipe_inode_info *pipe, struct pipe_inode_info *pipe,
struct file *outfilp, struct file *outfilp,
loff_t *ppos, loff_t *ppos,
size_t count, size_t count,
int flags, int flags,
int ioflags, int ioflags)
cred_t *credp)
{ {
xfs_inode_t *ip = XFS_BHVTOI(bdp); bhv_vnode_t *vp = XFS_ITOV(ip);
xfs_mount_t *mp = ip->i_mount; xfs_mount_t *mp = ip->i_mount;
xfs_iocore_t *io = &ip->i_iocore; xfs_iocore_t *io = &ip->i_iocore;
ssize_t ret; ssize_t ret;
...@@ -356,8 +348,7 @@ xfs_splice_write( ...@@ -356,8 +348,7 @@ xfs_splice_write(
bhv_vrwlock_t locktype = VRWLOCK_WRITE; bhv_vrwlock_t locktype = VRWLOCK_WRITE;
int error; int error;
error = XFS_SEND_DATA(mp, DM_EVENT_WRITE, BHV_TO_VNODE(bdp), error = XFS_SEND_DATA(mp, DM_EVENT_WRITE, vp, *ppos, count,
*ppos, count,
FILP_DELAY_FLAG(outfilp), &locktype); FILP_DELAY_FLAG(outfilp), &locktype);
if (error) { if (error) {
xfs_iunlock(ip, XFS_IOLOCK_EXCL); xfs_iunlock(ip, XFS_IOLOCK_EXCL);
...@@ -591,24 +582,22 @@ xfs_zero_eof( ...@@ -591,24 +582,22 @@ xfs_zero_eof(
ssize_t /* bytes written, or (-) error */ ssize_t /* bytes written, or (-) error */
xfs_write( xfs_write(
bhv_desc_t *bdp, struct xfs_inode *xip,
struct kiocb *iocb, struct kiocb *iocb,
const struct iovec *iovp, const struct iovec *iovp,
unsigned int nsegs, unsigned int nsegs,
loff_t *offset, loff_t *offset,
int ioflags, int ioflags)
cred_t *credp)
{ {
struct file *file = iocb->ki_filp; struct file *file = iocb->ki_filp;
struct address_space *mapping = file->f_mapping; struct address_space *mapping = file->f_mapping;
struct inode *inode = mapping->host; struct inode *inode = mapping->host;
bhv_vnode_t *vp = XFS_ITOV(xip);
unsigned long segs = nsegs; unsigned long segs = nsegs;
xfs_inode_t *xip;
xfs_mount_t *mp; xfs_mount_t *mp;
ssize_t ret = 0, error = 0; ssize_t ret = 0, error = 0;
xfs_fsize_t isize, new_size; xfs_fsize_t isize, new_size;
xfs_iocore_t *io; xfs_iocore_t *io;
bhv_vnode_t *vp;
int iolock; int iolock;
int eventsent = 0; int eventsent = 0;
bhv_vrwlock_t locktype; bhv_vrwlock_t locktype;
...@@ -618,9 +607,6 @@ xfs_write( ...@@ -618,9 +607,6 @@ xfs_write(
XFS_STATS_INC(xs_write_calls); XFS_STATS_INC(xs_write_calls);
vp = BHV_TO_VNODE(bdp);
xip = XFS_BHVTOI(bdp);
error = generic_segment_checks(iovp, &segs, &ocount, VERIFY_READ); error = generic_segment_checks(iovp, &segs, &ocount, VERIFY_READ);
if (error) if (error)
return error; return error;
...@@ -730,7 +716,7 @@ xfs_write( ...@@ -730,7 +716,7 @@ xfs_write(
*/ */
if (pos > xip->i_size) { if (pos > xip->i_size) {
error = xfs_zero_eof(BHV_TO_VNODE(bdp), io, pos, xip->i_size); error = xfs_zero_eof(vp, io, pos, xip->i_size);
if (error) { if (error) {
xfs_iunlock(xip, XFS_ILOCK_EXCL); xfs_iunlock(xip, XFS_ILOCK_EXCL);
goto out_unlock_internal; goto out_unlock_internal;
...@@ -815,7 +801,7 @@ xfs_write( ...@@ -815,7 +801,7 @@ xfs_write(
if (ret == -ENOSPC && if (ret == -ENOSPC &&
DM_EVENT_ENABLED(xip, DM_EVENT_NOSPACE) && !(ioflags & IO_INVIS)) { DM_EVENT_ENABLED(xip, DM_EVENT_NOSPACE) && !(ioflags & IO_INVIS)) {
xfs_rwunlock(bdp, locktype); xfs_rwunlock(xip, locktype);
if (need_i_mutex) if (need_i_mutex)
mutex_unlock(&inode->i_mutex); mutex_unlock(&inode->i_mutex);
error = XFS_SEND_NAMESP(xip->i_mount, DM_EVENT_NOSPACE, vp, error = XFS_SEND_NAMESP(xip->i_mount, DM_EVENT_NOSPACE, vp,
...@@ -823,7 +809,7 @@ xfs_write( ...@@ -823,7 +809,7 @@ xfs_write(
0, 0, 0); /* Delay flag intentionally unused */ 0, 0, 0); /* Delay flag intentionally unused */
if (need_i_mutex) if (need_i_mutex)
mutex_lock(&inode->i_mutex); mutex_lock(&inode->i_mutex);
xfs_rwlock(bdp, locktype); xfs_rwlock(xip, locktype);
if (error) if (error)
goto out_unlock_internal; goto out_unlock_internal;
pos = xip->i_size; pos = xip->i_size;
...@@ -854,7 +840,7 @@ xfs_write( ...@@ -854,7 +840,7 @@ xfs_write(
if (error) if (error)
goto out_unlock_internal; goto out_unlock_internal;
xfs_rwunlock(bdp, locktype); xfs_rwunlock(xip, locktype);
if (need_i_mutex) if (need_i_mutex)
mutex_unlock(&inode->i_mutex); mutex_unlock(&inode->i_mutex);
...@@ -863,7 +849,7 @@ xfs_write( ...@@ -863,7 +849,7 @@ xfs_write(
error = -ret; error = -ret;
if (need_i_mutex) if (need_i_mutex)
mutex_lock(&inode->i_mutex); mutex_lock(&inode->i_mutex);
xfs_rwlock(bdp, locktype); xfs_rwlock(xip, locktype);
} }
out_unlock_internal: out_unlock_internal:
...@@ -881,7 +867,7 @@ xfs_write( ...@@ -881,7 +867,7 @@ xfs_write(
xip->i_d.di_size = xip->i_size; xip->i_d.di_size = xip->i_size;
xfs_iunlock(xip, XFS_ILOCK_EXCL); xfs_iunlock(xip, XFS_ILOCK_EXCL);
} }
xfs_rwunlock(bdp, locktype); xfs_rwunlock(xip, locktype);
out_unlock_mutex: out_unlock_mutex:
if (need_i_mutex) if (need_i_mutex)
mutex_unlock(&inode->i_mutex); mutex_unlock(&inode->i_mutex);
...@@ -920,14 +906,14 @@ xfs_bdstrat_cb(struct xfs_buf *bp) ...@@ -920,14 +906,14 @@ xfs_bdstrat_cb(struct xfs_buf *bp)
int int
xfs_bmap(bhv_desc_t *bdp, xfs_bmap(
xfs_inode_t *ip,
xfs_off_t offset, xfs_off_t offset,
ssize_t count, ssize_t count,
int flags, int flags,
xfs_iomap_t *iomapp, xfs_iomap_t *iomapp,
int *niomaps) int *niomaps)
{ {
xfs_inode_t *ip = XFS_BHVTOI(bdp);
xfs_iocore_t *io = &ip->i_iocore; xfs_iocore_t *io = &ip->i_iocore;
ASSERT((ip->i_d.di_mode & S_IFMT) == S_IFREG); ASSERT((ip->i_d.di_mode & S_IFMT) == S_IFREG);
......
fs/xfs/linux-2.6/xfs_lrw.h
View file @ 993386c1
...@@ -71,25 +71,11 @@ extern void xfs_inval_cached_trace(struct xfs_iocore *, ...@@ -71,25 +71,11 @@ extern void xfs_inval_cached_trace(struct xfs_iocore *,
#define xfs_inval_cached_trace(io, offset, len, first, last) #define xfs_inval_cached_trace(io, offset, len, first, last)
#endif #endif
extern int xfs_bmap(struct bhv_desc *, xfs_off_t, ssize_t, int,
struct xfs_iomap *, int *);
extern int xfsbdstrat(struct xfs_mount *, struct xfs_buf *); extern int xfsbdstrat(struct xfs_mount *, struct xfs_buf *);
extern int xfs_bdstrat_cb(struct xfs_buf *); extern int xfs_bdstrat_cb(struct xfs_buf *);
extern int xfs_dev_is_read_only(struct xfs_mount *, char *); extern int xfs_dev_is_read_only(struct xfs_mount *, char *);
extern int xfs_zero_eof(struct bhv_vnode *, struct xfs_iocore *, xfs_off_t, extern int xfs_zero_eof(struct bhv_vnode *, struct xfs_iocore *, xfs_off_t,
xfs_fsize_t); xfs_fsize_t);
extern ssize_t xfs_read(struct bhv_desc *, struct kiocb *,
const struct iovec *, unsigned int,
loff_t *, int, struct cred *);
extern ssize_t xfs_write(struct bhv_desc *, struct kiocb *,
const struct iovec *, unsigned int,
loff_t *, int, struct cred *);
extern ssize_t xfs_splice_read(struct bhv_desc *, struct file *, loff_t *,
struct pipe_inode_info *, size_t, int, int,
struct cred *);
extern ssize_t xfs_splice_write(struct bhv_desc *, struct pipe_inode_info *,
struct file *, loff_t *, size_t, int, int,
struct cred *);
#endif /* __XFS_LRW_H__ */ #endif /* __XFS_LRW_H__ */
fs/xfs/xfs_attr.c
View file @ 993386c1
...@@ -156,10 +156,14 @@ xfs_attr_fetch(xfs_inode_t *ip, const char *name, int namelen, ...@@ -156,10 +156,14 @@ xfs_attr_fetch(xfs_inode_t *ip, const char *name, int namelen,
} }
int int
xfs_attr_get(bhv_desc_t *bdp, const char *name, char *value, int *valuelenp, xfs_attr_get(
int flags, struct cred *cred) xfs_inode_t *ip,
const char *name,
char *value,
int *valuelenp,
int flags,
cred_t *cred)
{ {
xfs_inode_t *ip = XFS_BHVTOI(bdp);
int error, namelen; int error, namelen;
XFS_STATS_INC(xs_attr_get); XFS_STATS_INC(xs_attr_get);
...@@ -417,10 +421,13 @@ xfs_attr_set_int(xfs_inode_t *dp, const char *name, int namelen, ...@@ -417,10 +421,13 @@ xfs_attr_set_int(xfs_inode_t *dp, const char *name, int namelen,
} }
int int
xfs_attr_set(bhv_desc_t *bdp, const char *name, char *value, int valuelen, int flags, xfs_attr_set(
struct cred *cred) xfs_inode_t *dp,
const char *name,
char *value,
int valuelen,
int flags)
{ {
xfs_inode_t *dp;
int namelen; int namelen;
namelen = strlen(name); namelen = strlen(name);
...@@ -429,7 +436,6 @@ xfs_attr_set(bhv_desc_t *bdp, const char *name, char *value, int valuelen, int f ...@@ -429,7 +436,6 @@ xfs_attr_set(bhv_desc_t *bdp, const char *name, char *value, int valuelen, int f
XFS_STATS_INC(xs_attr_set); XFS_STATS_INC(xs_attr_set);
dp = XFS_BHVTOI(bdp);
if (XFS_FORCED_SHUTDOWN(dp->i_mount)) if (XFS_FORCED_SHUTDOWN(dp->i_mount))
return (EIO); return (EIO);
...@@ -563,10 +569,12 @@ xfs_attr_remove_int(xfs_inode_t *dp, const char *name, int namelen, int flags) ...@@ -563,10 +569,12 @@ xfs_attr_remove_int(xfs_inode_t *dp, const char *name, int namelen, int flags)
} }
int int
xfs_attr_remove(bhv_desc_t *bdp, const char *name, int flags, struct cred *cred) xfs_attr_remove(
xfs_inode_t *dp,
const char *name,
int flags)
{ {
xfs_inode_t *dp; int namelen;
int namelen;
namelen = strlen(name); namelen = strlen(name);
if (namelen >= MAXNAMELEN) if (namelen >= MAXNAMELEN)
...@@ -574,7 +582,6 @@ xfs_attr_remove(bhv_desc_t *bdp, const char *name, int flags, struct cred *cred) ...@@ -574,7 +582,6 @@ xfs_attr_remove(bhv_desc_t *bdp, const char *name, int flags, struct cred *cred)
XFS_STATS_INC(xs_attr_remove); XFS_STATS_INC(xs_attr_remove);
dp = XFS_BHVTOI(bdp);
if (XFS_FORCED_SHUTDOWN(dp->i_mount)) if (XFS_FORCED_SHUTDOWN(dp->i_mount))
return (EIO); return (EIO);
...@@ -702,11 +709,14 @@ xfs_attr_kern_list_sizes(xfs_attr_list_context_t *context, attrnames_t *namesp, ...@@ -702,11 +709,14 @@ xfs_attr_kern_list_sizes(xfs_attr_list_context_t *context, attrnames_t *namesp,
* success. * success.
*/ */
int int
xfs_attr_list(bhv_desc_t *bdp, char *buffer, int bufsize, int flags, xfs_attr_list(
attrlist_cursor_kern_t *cursor, struct cred *cred) xfs_inode_t *dp,
char *buffer,
int bufsize,
int flags,
attrlist_cursor_kern_t *cursor)
{ {
xfs_attr_list_context_t context; xfs_attr_list_context_t context;
xfs_inode_t *dp;
int error; int error;
XFS_STATS_INC(xs_attr_list); XFS_STATS_INC(xs_attr_list);
...@@ -731,7 +741,7 @@ xfs_attr_list(bhv_desc_t *bdp, char *buffer, int bufsize, int flags, ...@@ -731,7 +741,7 @@ xfs_attr_list(bhv_desc_t *bdp, char *buffer, int bufsize, int flags,
/* /*
* Initialize the output buffer. * Initialize the output buffer.
*/ */
context.dp = dp = XFS_BHVTOI(bdp); context.dp = dp;
context.cursor = cursor; context.cursor = cursor;
context.count = 0; context.count = 0;
context.dupcnt = 0; context.dupcnt = 0;
......
fs/xfs/xfs_attr.h
View file @ 993386c1
...@@ -159,12 +159,8 @@ struct xfs_da_args; ...@@ -159,12 +159,8 @@ struct xfs_da_args;
/* /*
* Overall external interface routines. * Overall external interface routines.
*/ */
int xfs_attr_get(bhv_desc_t *, const char *, char *, int *, int, struct cred *);
int xfs_attr_set(bhv_desc_t *, const char *, char *, int, int, struct cred *);
int xfs_attr_set_int(struct xfs_inode *, const char *, int, char *, int, int); int xfs_attr_set_int(struct xfs_inode *, const char *, int, char *, int, int);
int xfs_attr_remove(bhv_desc_t *, const char *, int, struct cred *);
int xfs_attr_remove_int(struct xfs_inode *, const char *, int, int); int xfs_attr_remove_int(struct xfs_inode *, const char *, int, int);
int xfs_attr_list(bhv_desc_t *, char *, int, int, struct attrlist_cursor_kern *, struct cred *);
int xfs_attr_list_int(struct xfs_attr_list_context *); int xfs_attr_list_int(struct xfs_attr_list_context *);
int xfs_attr_inactive(struct xfs_inode *dp); int xfs_attr_inactive(struct xfs_inode *dp);
......
fs/xfs/xfs_bmap.c
View file @ 993386c1
...@@ -5764,7 +5764,7 @@ xfs_getbmapx_fix_eof_hole( ...@@ -5764,7 +5764,7 @@ xfs_getbmapx_fix_eof_hole(
*/ */
int /* error code */ int /* error code */
xfs_getbmap( xfs_getbmap(
bhv_desc_t *bdp, /* XFS behavior descriptor*/ xfs_inode_t *ip,
struct getbmap *bmv, /* user bmap structure */ struct getbmap *bmv, /* user bmap structure */
void __user *ap, /* pointer to user's array */ void __user *ap, /* pointer to user's array */
int interface) /* interface flags */ int interface) /* interface flags */
...@@ -5773,7 +5773,6 @@ xfs_getbmap( ...@@ -5773,7 +5773,6 @@ xfs_getbmap(
int error; /* return value */ int error; /* return value */
__int64_t fixlen; /* length for -1 case */ __int64_t fixlen; /* length for -1 case */
int i; /* extent number */ int i; /* extent number */
xfs_inode_t *ip; /* xfs incore inode pointer */
bhv_vnode_t *vp; /* corresponding vnode */ bhv_vnode_t *vp; /* corresponding vnode */
int lock; /* lock state */ int lock; /* lock state */
xfs_bmbt_irec_t *map; /* buffer for user's data */ xfs_bmbt_irec_t *map; /* buffer for user's data */
...@@ -5791,8 +5790,7 @@ xfs_getbmap( ...@@ -5791,8 +5790,7 @@ xfs_getbmap(
int bmapi_flags; /* flags for xfs_bmapi */ int bmapi_flags; /* flags for xfs_bmapi */
__int32_t oflags; /* getbmapx bmv_oflags field */ __int32_t oflags; /* getbmapx bmv_oflags field */
vp = BHV_TO_VNODE(bdp); vp = XFS_ITOV(ip);
ip = XFS_BHVTOI(bdp);
mp = ip->i_mount; mp = ip->i_mount;
whichfork = interface & BMV_IF_ATTRFORK ? XFS_ATTR_FORK : XFS_DATA_FORK; whichfork = interface & BMV_IF_ATTRFORK ? XFS_ATTR_FORK : XFS_DATA_FORK;
......
fs/xfs/xfs_bmap.h
View file @ 993386c1
...@@ -335,7 +335,7 @@ xfs_bunmapi( ...@@ -335,7 +335,7 @@ xfs_bunmapi(
*/ */
int /* error code */ int /* error code */
xfs_getbmap( xfs_getbmap(
bhv_desc_t *bdp, /* XFS behavior descriptor*/ xfs_inode_t *ip,
struct getbmap *bmv, /* user bmap structure */ struct getbmap *bmv, /* user bmap structure */
void __user *ap, /* pointer to user's array */ void __user *ap, /* pointer to user's array */
int iflags); /* interface flags */ int iflags); /* interface flags */
......
fs/xfs/xfs_dir2.c
View file @ 993386c1
...@@ -292,18 +292,16 @@ xfs_dir_removename( ...@@ -292,18 +292,16 @@ xfs_dir_removename(
*/ */
int int
xfs_readdir( xfs_readdir(
bhv_desc_t *dir_bdp, xfs_inode_t *dp,
void *dirent, void *dirent,
size_t bufsize, size_t bufsize,
xfs_off_t *offset, xfs_off_t *offset,
filldir_t filldir) filldir_t filldir)
{ {
xfs_inode_t *dp = XFS_BHVTOI(dir_bdp);
int rval; /* return value */ int rval; /* return value */
int v; /* type-checking value */ int v; /* type-checking value */
vn_trace_entry(BHV_TO_VNODE(dir_bdp), __FUNCTION__, vn_trace_entry(XFS_ITOV(dp), __FUNCTION__, (inst_t *)__return_address);
(inst_t *)__return_address);
if (XFS_FORCED_SHUTDOWN(dp->i_mount)) if (XFS_FORCED_SHUTDOWN(dp->i_mount))
return XFS_ERROR(EIO); return XFS_ERROR(EIO);
......
fs/xfs/xfs_dir2.h
View file @ 993386c1
...@@ -84,8 +84,6 @@ extern int xfs_dir_replace(struct xfs_trans *tp, struct xfs_inode *dp, ...@@ -84,8 +84,6 @@ extern int xfs_dir_replace(struct xfs_trans *tp, struct xfs_inode *dp,
extern int xfs_dir_canenter(struct xfs_trans *tp, struct xfs_inode *dp, extern int xfs_dir_canenter(struct xfs_trans *tp, struct xfs_inode *dp,
char *name, int namelen); char *name, int namelen);
extern int xfs_dir_ino_validate(struct xfs_mount *mp, xfs_ino_t ino); extern int xfs_dir_ino_validate(struct xfs_mount *mp, xfs_ino_t ino);
extern int xfs_readdir(bhv_desc_t *dir_bdp, void *dirent, size_t bufsize,
xfs_off_t *offset, filldir_t filldir);
/* /*
* Utility routines for v2 directories. * Utility routines for v2 directories.
......
fs/xfs/xfs_rename.c
View file @ 993386c1
...@@ -129,8 +129,7 @@ xfs_lock_for_rename( ...@@ -129,8 +129,7 @@ xfs_lock_for_rename(
lock_mode = xfs_ilock_map_shared(dp2); lock_mode = xfs_ilock_map_shared(dp2);
} }
error = xfs_dir_lookup_int(XFS_ITOBHV(dp2), lock_mode, error = xfs_dir_lookup_int(dp2, lock_mode, vname2, &inum2, &ip2);
vname2, &inum2, &ip2);
if (error == ENOENT) { /* target does not need to exist. */ if (error == ENOENT) { /* target does not need to exist. */
inum2 = 0; inum2 = 0;
} else if (error) { } else if (error) {
...@@ -222,15 +221,15 @@ xfs_lock_for_rename( ...@@ -222,15 +221,15 @@ xfs_lock_for_rename(
*/ */
int int
xfs_rename( xfs_rename(
bhv_desc_t *src_dir_bdp, xfs_inode_t *src_dp,
bhv_vname_t *src_vname, bhv_vname_t *src_vname,
bhv_vnode_t *target_dir_vp, bhv_vnode_t *target_dir_vp,
bhv_vname_t *target_vname, bhv_vname_t *target_vname)
cred_t *credp)
{ {
bhv_vnode_t *src_dir_vp = XFS_ITOV(src_dp);
xfs_trans_t *tp; xfs_trans_t *tp;
xfs_inode_t *src_dp, *target_dp, *src_ip, *target_ip; xfs_inode_t *target_dp, *src_ip, *target_ip;
xfs_mount_t *mp; xfs_mount_t *mp = src_dp->i_mount;
int new_parent; /* moving to a new dir */ int new_parent; /* moving to a new dir */
int src_is_directory; /* src_name is a directory */ int src_is_directory; /* src_name is a directory */
int error; int error;
...@@ -240,7 +239,6 @@ xfs_rename( ...@@ -240,7 +239,6 @@ xfs_rename(
int committed; int committed;
xfs_inode_t *inodes[4]; xfs_inode_t *inodes[4];
int target_ip_dropped = 0; /* dropped target_ip link? */ int target_ip_dropped = 0; /* dropped target_ip link? */
bhv_vnode_t *src_dir_vp;
int spaceres; int spaceres;
int target_link_zero = 0; int target_link_zero = 0;
int num_inodes; int num_inodes;
...@@ -249,7 +247,6 @@ xfs_rename( ...@@ -249,7 +247,6 @@ xfs_rename(
int src_namelen = VNAMELEN(src_vname); int src_namelen = VNAMELEN(src_vname);
int target_namelen = VNAMELEN(target_vname); int target_namelen = VNAMELEN(target_vname);
src_dir_vp = BHV_TO_VNODE(src_dir_bdp);
vn_trace_entry(src_dir_vp, "xfs_rename", (inst_t *)__return_address); vn_trace_entry(src_dir_vp, "xfs_rename", (inst_t *)__return_address);
vn_trace_entry(target_dir_vp, "xfs_rename", (inst_t *)__return_address); vn_trace_entry(target_dir_vp, "xfs_rename", (inst_t *)__return_address);
...@@ -262,9 +259,6 @@ xfs_rename( ...@@ -262,9 +259,6 @@ xfs_rename(
return XFS_ERROR(EXDEV); return XFS_ERROR(EXDEV);
} }
src_dp = XFS_BHVTOI(src_dir_bdp);
mp = src_dp->i_mount;
if (DM_EVENT_ENABLED(src_dp, DM_EVENT_RENAME) || if (DM_EVENT_ENABLED(src_dp, DM_EVENT_RENAME) ||
DM_EVENT_ENABLED(target_dp, DM_EVENT_RENAME)) { DM_EVENT_ENABLED(target_dp, DM_EVENT_RENAME)) {
error = XFS_SEND_NAMESP(mp, DM_EVENT_RENAME, error = XFS_SEND_NAMESP(mp, DM_EVENT_RENAME,
......
fs/xfs/xfs_rw.h
View file @ 993386c1
...@@ -90,14 +90,6 @@ extern void xfs_ioerror_alert(char *func, struct xfs_mount *mp, ...@@ -90,14 +90,6 @@ extern void xfs_ioerror_alert(char *func, struct xfs_mount *mp,
/* /*
* Prototypes for functions in xfs_vnodeops.c. * Prototypes for functions in xfs_vnodeops.c.
*/ */
extern int xfs_rwlock(bhv_desc_t *bdp, bhv_vrwlock_t write_lock);
extern void xfs_rwunlock(bhv_desc_t *bdp, bhv_vrwlock_t write_lock);
extern int xfs_setattr(bhv_desc_t *, bhv_vattr_t *vap, int flags,
cred_t *credp);
extern int xfs_change_file_space(bhv_desc_t *bdp, int cmd, xfs_flock64_t *bf,
xfs_off_t offset, cred_t *credp, int flags);
extern int xfs_set_dmattrs(bhv_desc_t *bdp, u_int evmask, u_int16_t state,
cred_t *credp);
extern int xfs_free_eofblocks(struct xfs_mount *mp, struct xfs_inode *ip, extern int xfs_free_eofblocks(struct xfs_mount *mp, struct xfs_inode *ip,
int flags); int flags);
......
fs/xfs/xfs_utils.c
View file @ 993386c1
...@@ -65,20 +65,15 @@ xfs_get_dir_entry( ...@@ -65,20 +65,15 @@ xfs_get_dir_entry(
int int
xfs_dir_lookup_int( xfs_dir_lookup_int(
bhv_desc_t *dir_bdp, xfs_inode_t *dp,
uint lock_mode, uint lock_mode,
bhv_vname_t *dentry, bhv_vname_t *dentry,
xfs_ino_t *inum, xfs_ino_t *inum,
xfs_inode_t **ipp) xfs_inode_t **ipp)
{ {
bhv_vnode_t *dir_vp;
xfs_inode_t *dp;
int error; int error;
dir_vp = BHV_TO_VNODE(dir_bdp); vn_trace_entry(XFS_ITOV(dp), __FUNCTION__, (inst_t *)__return_address);
vn_trace_entry(dir_vp, __FUNCTION__, (inst_t *)__return_address);
dp = XFS_BHVTOI(dir_bdp);
error = xfs_dir_lookup(NULL, dp, VNAME(dentry), VNAMELEN(dentry), inum); error = xfs_dir_lookup(NULL, dp, VNAME(dentry), VNAMELEN(dentry), inum);
if (!error) { if (!error) {
......
fs/xfs/xfs_utils.h
View file @ 993386c1
...@@ -23,10 +23,8 @@ ...@@ -23,10 +23,8 @@
#define ITRACE(ip) vn_trace_ref(XFS_ITOV(ip), __FILE__, __LINE__, \ #define ITRACE(ip) vn_trace_ref(XFS_ITOV(ip), __FILE__, __LINE__, \
(inst_t *)__return_address) (inst_t *)__return_address)
extern int xfs_rename (bhv_desc_t *, bhv_vname_t *, bhv_vnode_t *,
bhv_vname_t *, cred_t *);
extern int xfs_get_dir_entry (bhv_vname_t *, xfs_inode_t **); extern int xfs_get_dir_entry (bhv_vname_t *, xfs_inode_t **);
extern int xfs_dir_lookup_int (bhv_desc_t *, uint, bhv_vname_t *, xfs_ino_t *, extern int xfs_dir_lookup_int (xfs_inode_t *, uint, bhv_vname_t *, xfs_ino_t *,
xfs_inode_t **); xfs_inode_t **);
extern int xfs_truncate_file (xfs_mount_t *, xfs_inode_t *); extern int xfs_truncate_file (xfs_mount_t *, xfs_inode_t *);
extern int xfs_dir_ialloc (xfs_trans_t **, xfs_inode_t *, mode_t, xfs_nlink_t, extern int xfs_dir_ialloc (xfs_trans_t **, xfs_inode_t *, mode_t, xfs_nlink_t,
......
fs/xfs/xfs_vnodeops.c
View file @ 993386c1
...@@ -52,15 +52,13 @@ ...@@ -52,15 +52,13 @@
#include "xfs_trans_space.h" #include "xfs_trans_space.h"
#include "xfs_log_priv.h" #include "xfs_log_priv.h"
#include "xfs_filestream.h" #include "xfs_filestream.h"
#include "xfs_vnodeops.h"
STATIC int int
xfs_open( xfs_open(
bhv_desc_t *bdp, xfs_inode_t *ip)
cred_t *credp)
{ {
int mode; int mode;
bhv_vnode_t *vp = BHV_TO_VNODE(bdp);
xfs_inode_t *ip = XFS_BHVTOI(bdp);
if (XFS_FORCED_SHUTDOWN(ip->i_mount)) if (XFS_FORCED_SHUTDOWN(ip->i_mount))
return XFS_ERROR(EIO); return XFS_ERROR(EIO);
...@@ -69,7 +67,7 @@ xfs_open( ...@@ -69,7 +67,7 @@ xfs_open(
* If it's a directory with any blocks, read-ahead block 0 * If it's a directory with any blocks, read-ahead block 0
* as we're almost certain to have the next operation be a read there. * as we're almost certain to have the next operation be a read there.
*/ */
if (VN_ISDIR(vp) && ip->i_d.di_nextents > 0) { if (S_ISDIR(ip->i_d.di_mode) && ip->i_d.di_nextents > 0) {
mode = xfs_ilock_map_shared(ip); mode = xfs_ilock_map_shared(ip);
if (ip->i_d.di_nextents > 0) if (ip->i_d.di_nextents > 0)
(void)xfs_da_reada_buf(NULL, ip, 0, XFS_DATA_FORK); (void)xfs_da_reada_buf(NULL, ip, 0, XFS_DATA_FORK);
...@@ -81,23 +79,17 @@ xfs_open( ...@@ -81,23 +79,17 @@ xfs_open(
/* /*
* xfs_getattr * xfs_getattr
*/ */
STATIC int int
xfs_getattr( xfs_getattr(
bhv_desc_t *bdp, xfs_inode_t *ip,
bhv_vattr_t *vap, bhv_vattr_t *vap,
int flags, int flags)
cred_t *credp)
{ {
xfs_inode_t *ip; bhv_vnode_t *vp = XFS_ITOV(ip);
xfs_mount_t *mp; xfs_mount_t *mp = ip->i_mount;
bhv_vnode_t *vp;
vp = BHV_TO_VNODE(bdp);
vn_trace_entry(vp, __FUNCTION__, (inst_t *)__return_address); vn_trace_entry(vp, __FUNCTION__, (inst_t *)__return_address);
ip = XFS_BHVTOI(bdp);
mp = ip->i_mount;
if (XFS_FORCED_SHUTDOWN(mp)) if (XFS_FORCED_SHUTDOWN(mp))
return XFS_ERROR(EIO); return XFS_ERROR(EIO);
...@@ -215,14 +207,14 @@ xfs_getattr( ...@@ -215,14 +207,14 @@ xfs_getattr(
*/ */
int int
xfs_setattr( xfs_setattr(
bhv_desc_t *bdp, xfs_inode_t *ip,
bhv_vattr_t *vap, bhv_vattr_t *vap,
int flags, int flags,
cred_t *credp) cred_t *credp)
{ {
xfs_inode_t *ip; bhv_vnode_t *vp = XFS_ITOV(ip);
xfs_mount_t *mp = ip->i_mount;
xfs_trans_t *tp; xfs_trans_t *tp;
xfs_mount_t *mp;
int mask; int mask;
int code; int code;
uint lock_flags; uint lock_flags;
...@@ -230,14 +222,12 @@ xfs_setattr( ...@@ -230,14 +222,12 @@ xfs_setattr(
uid_t uid=0, iuid=0; uid_t uid=0, iuid=0;
gid_t gid=0, igid=0; gid_t gid=0, igid=0;
int timeflags = 0; int timeflags = 0;
bhv_vnode_t *vp;
xfs_prid_t projid=0, iprojid=0; xfs_prid_t projid=0, iprojid=0;
int mandlock_before, mandlock_after; int mandlock_before, mandlock_after;
struct xfs_dquot *udqp, *gdqp, *olddquot1, *olddquot2; struct xfs_dquot *udqp, *gdqp, *olddquot1, *olddquot2;
int file_owner; int file_owner;
int need_iolock = 1; int need_iolock = 1;
vp = BHV_TO_VNODE(bdp);
vn_trace_entry(vp, __FUNCTION__, (inst_t *)__return_address); vn_trace_entry(vp, __FUNCTION__, (inst_t *)__return_address);
if (vp->v_vfsp->vfs_flag & VFS_RDONLY) if (vp->v_vfsp->vfs_flag & VFS_RDONLY)
...@@ -251,9 +241,6 @@ xfs_setattr( ...@@ -251,9 +241,6 @@ xfs_setattr(
return XFS_ERROR(EINVAL); return XFS_ERROR(EINVAL);
} }
ip = XFS_BHVTOI(bdp);
mp = ip->i_mount;
if (XFS_FORCED_SHUTDOWN(mp)) if (XFS_FORCED_SHUTDOWN(mp))
return XFS_ERROR(EIO); return XFS_ERROR(EIO);
...@@ -924,19 +911,16 @@ xfs_setattr( ...@@ -924,19 +911,16 @@ xfs_setattr(
* xfs_access * xfs_access
* Null conversion from vnode mode bits to inode mode bits, as in efs. * Null conversion from vnode mode bits to inode mode bits, as in efs.
*/ */
STATIC int int
xfs_access( xfs_access(
bhv_desc_t *bdp, xfs_inode_t *ip,
int mode, int mode,
cred_t *credp) cred_t *credp)
{ {
xfs_inode_t *ip;
int error; int error;
vn_trace_entry(BHV_TO_VNODE(bdp), __FUNCTION__, vn_trace_entry(XFS_ITOV(ip), __FUNCTION__, (inst_t *)__return_address);
(inst_t *)__return_address);
ip = XFS_BHVTOI(bdp);
xfs_ilock(ip, XFS_ILOCK_SHARED); xfs_ilock(ip, XFS_ILOCK_SHARED);
error = xfs_iaccess(ip, mode, credp); error = xfs_iaccess(ip, mode, credp);
xfs_iunlock(ip, XFS_ILOCK_SHARED); xfs_iunlock(ip, XFS_ILOCK_SHARED);
...@@ -998,16 +982,11 @@ xfs_readlink_bmap( ...@@ -998,16 +982,11 @@ xfs_readlink_bmap(
return error; return error;
} }
/* int
* xfs_readlink
*
*/
STATIC int
xfs_readlink( xfs_readlink(
bhv_desc_t *bdp, xfs_inode_t *ip,
char *link) char *link)
{ {
xfs_inode_t *ip = XFS_BHVTOI(bdp);
xfs_mount_t *mp = ip->i_mount; xfs_mount_t *mp = ip->i_mount;
int pathlen; int pathlen;
int error = 0; int error = 0;
...@@ -1047,23 +1026,18 @@ xfs_readlink( ...@@ -1047,23 +1026,18 @@ xfs_readlink(
* be held while flushing the data, so acquire after we're done * be held while flushing the data, so acquire after we're done
* with that. * with that.
*/ */
STATIC int int
xfs_fsync( xfs_fsync(
bhv_desc_t *bdp, xfs_inode_t *ip,
int flag, int flag,
cred_t *credp,
xfs_off_t start, xfs_off_t start,
xfs_off_t stop) xfs_off_t stop)
{ {
xfs_inode_t *ip;
xfs_trans_t *tp; xfs_trans_t *tp;
int error; int error;
int log_flushed = 0, changed = 1; int log_flushed = 0, changed = 1;
vn_trace_entry(BHV_TO_VNODE(bdp), vn_trace_entry(XFS_ITOV(ip), __FUNCTION__, (inst_t *)__return_address);
__FUNCTION__, (inst_t *)__return_address);
ip = XFS_BHVTOI(bdp);
ASSERT(start >= 0 && stop >= -1); ASSERT(start >= 0 && stop >= -1);
...@@ -1533,19 +1507,14 @@ xfs_inactive_attrs( ...@@ -1533,19 +1507,14 @@ xfs_inactive_attrs(
return 0; return 0;
} }
STATIC int int
xfs_release( xfs_release(
bhv_desc_t *bdp) xfs_inode_t *ip)
{ {
xfs_inode_t *ip; bhv_vnode_t *vp = XFS_ITOV(ip);
bhv_vnode_t *vp; xfs_mount_t *mp = ip->i_mount;
xfs_mount_t *mp;
int error; int error;
vp = BHV_TO_VNODE(bdp);
ip = XFS_BHVTOI(bdp);
mp = ip->i_mount;
if (!VN_ISREG(vp) || (ip->i_d.di_mode == 0)) if (!VN_ISREG(vp) || (ip->i_d.di_mode == 0))
return 0; return 0;
...@@ -1611,13 +1580,11 @@ xfs_release( ...@@ -1611,13 +1580,11 @@ xfs_release(
* now be truncated. Also, we clear all of the read-ahead state * now be truncated. Also, we clear all of the read-ahead state
* kept for the inode here since the file is now closed. * kept for the inode here since the file is now closed.
*/ */
STATIC int int
xfs_inactive( xfs_inactive(
bhv_desc_t *bdp, xfs_inode_t *ip)
cred_t *credp)
{ {
xfs_inode_t *ip; bhv_vnode_t *vp = XFS_ITOV(ip);
bhv_vnode_t *vp;
xfs_bmap_free_t free_list; xfs_bmap_free_t free_list;
xfs_fsblock_t first_block; xfs_fsblock_t first_block;
int committed; int committed;
...@@ -1626,11 +1593,8 @@ xfs_inactive( ...@@ -1626,11 +1593,8 @@ xfs_inactive(
int error; int error;
int truncate; int truncate;
vp = BHV_TO_VNODE(bdp);
vn_trace_entry(vp, __FUNCTION__, (inst_t *)__return_address); vn_trace_entry(vp, __FUNCTION__, (inst_t *)__return_address);
ip = XFS_BHVTOI(bdp);
/* /*
* If the inode is already free, then there can be nothing * If the inode is already free, then there can be nothing
* to clean up here. * to clean up here.
...@@ -1831,34 +1795,24 @@ xfs_inactive( ...@@ -1831,34 +1795,24 @@ xfs_inactive(
} }
/* int
* xfs_lookup
*/
STATIC int
xfs_lookup( xfs_lookup(
bhv_desc_t *dir_bdp, xfs_inode_t *dp,
bhv_vname_t *dentry, bhv_vname_t *dentry,
bhv_vnode_t **vpp, bhv_vnode_t **vpp)
int flags,
bhv_vnode_t *rdir,
cred_t *credp)
{ {
xfs_inode_t *dp, *ip; xfs_inode_t *ip;
xfs_ino_t e_inum; xfs_ino_t e_inum;
int error; int error;
uint lock_mode; uint lock_mode;
bhv_vnode_t *dir_vp;
dir_vp = BHV_TO_VNODE(dir_bdp);
vn_trace_entry(dir_vp, __FUNCTION__, (inst_t *)__return_address);
dp = XFS_BHVTOI(dir_bdp); vn_trace_entry(XFS_ITOV(dp), __FUNCTION__, (inst_t *)__return_address);
if (XFS_FORCED_SHUTDOWN(dp->i_mount)) if (XFS_FORCED_SHUTDOWN(dp->i_mount))
return XFS_ERROR(EIO); return XFS_ERROR(EIO);
lock_mode = xfs_ilock_map_shared(dp); lock_mode = xfs_ilock_map_shared(dp);
error = xfs_dir_lookup_int(dir_bdp, lock_mode, dentry, &e_inum, &ip); error = xfs_dir_lookup_int(dp, lock_mode, dentry, &e_inum, &ip);
if (!error) { if (!error) {
*vpp = XFS_ITOV(ip); *vpp = XFS_ITOV(ip);
ITRACE(ip); ITRACE(ip);
...@@ -1867,29 +1821,25 @@ xfs_lookup( ...@@ -1867,29 +1821,25 @@ xfs_lookup(
return error; return error;
} }
int
/*
* xfs_create (create a new file).
*/
STATIC int
xfs_create( xfs_create(
bhv_desc_t *dir_bdp, xfs_inode_t *dp,
bhv_vname_t *dentry, bhv_vname_t *dentry,
bhv_vattr_t *vap, bhv_vattr_t *vap,
bhv_vnode_t **vpp, bhv_vnode_t **vpp,
cred_t *credp) cred_t *credp)
{ {
char *name = VNAME(dentry); char *name = VNAME(dentry);
bhv_vnode_t *dir_vp; xfs_mount_t *mp = dp->i_mount;
xfs_inode_t *dp, *ip; bhv_vnode_t *dir_vp = XFS_ITOV(dp);
xfs_inode_t *ip;
bhv_vnode_t *vp = NULL; bhv_vnode_t *vp = NULL;
xfs_trans_t *tp; xfs_trans_t *tp;
xfs_mount_t *mp;
xfs_dev_t rdev; xfs_dev_t rdev;
int error; int error;
xfs_bmap_free_t free_list; xfs_bmap_free_t free_list;
xfs_fsblock_t first_block; xfs_fsblock_t first_block;
boolean_t dp_joined_to_trans; boolean_t unlock_dp_on_error = B_FALSE;
int dm_event_sent = 0; int dm_event_sent = 0;
uint cancel_flags; uint cancel_flags;
int committed; int committed;
...@@ -1900,12 +1850,8 @@ xfs_create( ...@@ -1900,12 +1850,8 @@ xfs_create(
int namelen; int namelen;
ASSERT(!*vpp); ASSERT(!*vpp);
dir_vp = BHV_TO_VNODE(dir_bdp);
vn_trace_entry(dir_vp, __FUNCTION__, (inst_t *)__return_address); vn_trace_entry(dir_vp, __FUNCTION__, (inst_t *)__return_address);
dp = XFS_BHVTOI(dir_bdp);
mp = dp->i_mount;
dm_di_mode = vap->va_mode; dm_di_mode = vap->va_mode;
namelen = VNAMELEN(dentry); namelen = VNAMELEN(dentry);
...@@ -1943,7 +1889,6 @@ xfs_create( ...@@ -1943,7 +1889,6 @@ xfs_create(
goto std_return; goto std_return;
ip = NULL; ip = NULL;
dp_joined_to_trans = B_FALSE;
tp = xfs_trans_alloc(mp, XFS_TRANS_CREATE); tp = xfs_trans_alloc(mp, XFS_TRANS_CREATE);
cancel_flags = XFS_TRANS_RELEASE_LOG_RES; cancel_flags = XFS_TRANS_RELEASE_LOG_RES;
...@@ -1963,11 +1908,11 @@ xfs_create( ...@@ -1963,11 +1908,11 @@ xfs_create(
} }
if (error) { if (error) {
cancel_flags = 0; cancel_flags = 0;
dp = NULL;
goto error_return; goto error_return;
} }
xfs_ilock(dp, XFS_ILOCK_EXCL | XFS_ILOCK_PARENT); xfs_ilock(dp, XFS_ILOCK_EXCL | XFS_ILOCK_PARENT);
unlock_dp_on_error = B_TRUE;
XFS_BMAP_INIT(&free_list, &first_block); XFS_BMAP_INIT(&free_list, &first_block);
...@@ -2001,15 +1946,15 @@ xfs_create( ...@@ -2001,15 +1946,15 @@ xfs_create(
ASSERT(ismrlocked (&ip->i_lock, MR_UPDATE)); ASSERT(ismrlocked (&ip->i_lock, MR_UPDATE));
/* /*
* Now we join the directory inode to the transaction. * Now we join the directory inode to the transaction. We do not do it
* We do not do it earlier because xfs_dir_ialloc * earlier because xfs_dir_ialloc might commit the previous transaction
* might commit the previous transaction (and release * (and release all the locks). An error from here on will result in
* all the locks). * the transaction cancel unlocking dp so don't do it explicitly in the
* error path.
*/ */
VN_HOLD(dir_vp); VN_HOLD(dir_vp);
xfs_trans_ijoin(tp, dp, XFS_ILOCK_EXCL); xfs_trans_ijoin(tp, dp, XFS_ILOCK_EXCL);
dp_joined_to_trans = B_TRUE; unlock_dp_on_error = B_FALSE;
error = xfs_dir_createname(tp, dp, name, namelen, ip->i_ino, error = xfs_dir_createname(tp, dp, name, namelen, ip->i_ino,
&first_block, &free_list, resblks ? &first_block, &free_list, resblks ?
...@@ -2075,7 +2020,7 @@ xfs_create( ...@@ -2075,7 +2020,7 @@ xfs_create(
std_return: std_return:
if ((*vpp || (error != 0 && dm_event_sent != 0)) && if ((*vpp || (error != 0 && dm_event_sent != 0)) &&
DM_EVENT_ENABLED(XFS_BHVTOI(dir_bdp), DM_EVENT_POSTCREATE)) { DM_EVENT_ENABLED(dp, DM_EVENT_POSTCREATE)) {
(void) XFS_SEND_NAMESP(mp, DM_EVENT_POSTCREATE, (void) XFS_SEND_NAMESP(mp, DM_EVENT_POSTCREATE,
dir_vp, DM_RIGHT_NULL, dir_vp, DM_RIGHT_NULL,
*vpp ? vp:NULL, *vpp ? vp:NULL,
...@@ -2092,11 +2037,12 @@ xfs_create( ...@@ -2092,11 +2037,12 @@ xfs_create(
if (tp != NULL) if (tp != NULL)
xfs_trans_cancel(tp, cancel_flags); xfs_trans_cancel(tp, cancel_flags);
if (!dp_joined_to_trans && (dp != NULL))
xfs_iunlock(dp, XFS_ILOCK_EXCL);
XFS_QM_DQRELE(mp, udqp); XFS_QM_DQRELE(mp, udqp);
XFS_QM_DQRELE(mp, gdqp); XFS_QM_DQRELE(mp, gdqp);
if (unlock_dp_on_error)
xfs_iunlock(dp, XFS_ILOCK_EXCL);
goto std_return; goto std_return;
abort_rele: abort_rele:
...@@ -2367,22 +2313,16 @@ int remove_which_error_return = 0; ...@@ -2367,22 +2313,16 @@ int remove_which_error_return = 0;
#define REMOVE_DEBUG_TRACE(x) #define REMOVE_DEBUG_TRACE(x)
#endif /* ! DEBUG */ #endif /* ! DEBUG */
int
/*
* xfs_remove
*
*/
STATIC int
xfs_remove( xfs_remove(
bhv_desc_t *dir_bdp, xfs_inode_t *dp,
bhv_vname_t *dentry, bhv_vname_t *dentry)
cred_t *credp)
{ {
bhv_vnode_t *dir_vp; bhv_vnode_t *dir_vp = XFS_ITOV(dp);
char *name = VNAME(dentry); char *name = VNAME(dentry);
xfs_inode_t *dp, *ip; xfs_mount_t *mp = dp->i_mount;
xfs_inode_t *ip;
xfs_trans_t *tp = NULL; xfs_trans_t *tp = NULL;
xfs_mount_t *mp;
int error = 0; int error = 0;
xfs_bmap_free_t free_list; xfs_bmap_free_t free_list;
xfs_fsblock_t first_block; xfs_fsblock_t first_block;
...@@ -2393,12 +2333,8 @@ xfs_remove( ...@@ -2393,12 +2333,8 @@ xfs_remove(
uint resblks; uint resblks;
int namelen; int namelen;
dir_vp = BHV_TO_VNODE(dir_bdp);
vn_trace_entry(dir_vp, __FUNCTION__, (inst_t *)__return_address); vn_trace_entry(dir_vp, __FUNCTION__, (inst_t *)__return_address);
dp = XFS_BHVTOI(dir_bdp);
mp = dp->i_mount;
if (XFS_FORCED_SHUTDOWN(mp)) if (XFS_FORCED_SHUTDOWN(mp))
return XFS_ERROR(EIO); return XFS_ERROR(EIO);
...@@ -2623,42 +2559,32 @@ xfs_remove( ...@@ -2623,42 +2559,32 @@ xfs_remove(
goto std_return; goto std_return;
} }
int
/*
* xfs_link
*
*/
STATIC int
xfs_link( xfs_link(
bhv_desc_t *target_dir_bdp, xfs_inode_t *tdp,
bhv_vnode_t *src_vp, bhv_vnode_t *src_vp,
bhv_vname_t *dentry, bhv_vname_t *dentry)
cred_t *credp)
{ {
xfs_inode_t *tdp, *sip; bhv_vnode_t *target_dir_vp = XFS_ITOV(tdp);
xfs_mount_t *mp = tdp->i_mount;
xfs_inode_t *sip = xfs_vtoi(src_vp);
xfs_trans_t *tp; xfs_trans_t *tp;
xfs_mount_t *mp;
xfs_inode_t *ips[2]; xfs_inode_t *ips[2];
int error; int error;
xfs_bmap_free_t free_list; xfs_bmap_free_t free_list;
xfs_fsblock_t first_block; xfs_fsblock_t first_block;
int cancel_flags; int cancel_flags;
int committed; int committed;
bhv_vnode_t *target_dir_vp;
int resblks; int resblks;
char *target_name = VNAME(dentry); char *target_name = VNAME(dentry);
int target_namelen; int target_namelen;
target_dir_vp = BHV_TO_VNODE(target_dir_bdp);
vn_trace_entry(target_dir_vp, __FUNCTION__, (inst_t *)__return_address); vn_trace_entry(target_dir_vp, __FUNCTION__, (inst_t *)__return_address);
vn_trace_entry(src_vp, __FUNCTION__, (inst_t *)__return_address); vn_trace_entry(src_vp, __FUNCTION__, (inst_t *)__return_address);
target_namelen = VNAMELEN(dentry); target_namelen = VNAMELEN(dentry);
ASSERT(!VN_ISDIR(src_vp)); ASSERT(!VN_ISDIR(src_vp));
sip = xfs_vtoi(src_vp);
tdp = XFS_BHVTOI(target_dir_bdp);
mp = tdp->i_mount;
if (XFS_FORCED_SHUTDOWN(mp)) if (XFS_FORCED_SHUTDOWN(mp))
return XFS_ERROR(EIO); return XFS_ERROR(EIO);
...@@ -2791,50 +2717,38 @@ xfs_link( ...@@ -2791,50 +2717,38 @@ xfs_link(
} }
/* int
* xfs_mkdir
*
*/
STATIC int
xfs_mkdir( xfs_mkdir(
bhv_desc_t *dir_bdp, xfs_inode_t *dp,
bhv_vname_t *dentry, bhv_vname_t *dentry,
bhv_vattr_t *vap, bhv_vattr_t *vap,
bhv_vnode_t **vpp, bhv_vnode_t **vpp,
cred_t *credp) cred_t *credp)
{ {
bhv_vnode_t *dir_vp = XFS_ITOV(dp);
char *dir_name = VNAME(dentry); char *dir_name = VNAME(dentry);
xfs_inode_t *dp; int dir_namelen = VNAMELEN(dentry);
xfs_mount_t *mp = dp->i_mount;
xfs_inode_t *cdp; /* inode of created dir */ xfs_inode_t *cdp; /* inode of created dir */
bhv_vnode_t *cvp; /* vnode of created dir */ bhv_vnode_t *cvp; /* vnode of created dir */
xfs_trans_t *tp; xfs_trans_t *tp;
xfs_mount_t *mp;
int cancel_flags; int cancel_flags;
int error; int error;
int committed; int committed;
xfs_bmap_free_t free_list; xfs_bmap_free_t free_list;
xfs_fsblock_t first_block; xfs_fsblock_t first_block;
bhv_vnode_t *dir_vp; boolean_t unlock_dp_on_error = B_FALSE;
boolean_t dp_joined_to_trans;
boolean_t created = B_FALSE; boolean_t created = B_FALSE;
int dm_event_sent = 0; int dm_event_sent = 0;
xfs_prid_t prid; xfs_prid_t prid;
struct xfs_dquot *udqp, *gdqp; struct xfs_dquot *udqp, *gdqp;
uint resblks; uint resblks;
int dm_di_mode; int dm_di_mode;
int dir_namelen;
dir_vp = BHV_TO_VNODE(dir_bdp);
dp = XFS_BHVTOI(dir_bdp);
mp = dp->i_mount;
if (XFS_FORCED_SHUTDOWN(mp)) if (XFS_FORCED_SHUTDOWN(mp))
return XFS_ERROR(EIO); return XFS_ERROR(EIO);
dir_namelen = VNAMELEN(dentry);
tp = NULL; tp = NULL;
dp_joined_to_trans = B_FALSE;
dm_di_mode = vap->va_mode; dm_di_mode = vap->va_mode;
if (DM_EVENT_ENABLED(dp, DM_EVENT_CREATE)) { if (DM_EVENT_ENABLED(dp, DM_EVENT_CREATE)) {
...@@ -2882,11 +2796,11 @@ xfs_mkdir( ...@@ -2882,11 +2796,11 @@ xfs_mkdir(
} }
if (error) { if (error) {
cancel_flags = 0; cancel_flags = 0;
dp = NULL;
goto error_return; goto error_return;
} }
xfs_ilock(dp, XFS_ILOCK_EXCL | XFS_ILOCK_PARENT); xfs_ilock(dp, XFS_ILOCK_EXCL | XFS_ILOCK_PARENT);
unlock_dp_on_error = B_TRUE;
/* /*
* Check for directory link count overflow. * Check for directory link count overflow.
...@@ -2923,11 +2837,13 @@ xfs_mkdir( ...@@ -2923,11 +2837,13 @@ xfs_mkdir(
* Now we add the directory inode to the transaction. * Now we add the directory inode to the transaction.
* We waited until now since xfs_dir_ialloc might start * We waited until now since xfs_dir_ialloc might start
* a new transaction. Had we joined the transaction * a new transaction. Had we joined the transaction
* earlier, the locks might have gotten released. * earlier, the locks might have gotten released. An error
* from here on will result in the transaction cancel
* unlocking dp so don't do it explicitly in the error path.
*/ */
VN_HOLD(dir_vp); VN_HOLD(dir_vp);
xfs_trans_ijoin(tp, dp, XFS_ILOCK_EXCL); xfs_trans_ijoin(tp, dp, XFS_ILOCK_EXCL);
dp_joined_to_trans = B_TRUE; unlock_dp_on_error = B_FALSE;
XFS_BMAP_INIT(&free_list, &first_block); XFS_BMAP_INIT(&free_list, &first_block);
...@@ -2995,7 +2911,7 @@ xfs_mkdir( ...@@ -2995,7 +2911,7 @@ xfs_mkdir(
std_return: std_return:
if ((created || (error != 0 && dm_event_sent != 0)) && if ((created || (error != 0 && dm_event_sent != 0)) &&
DM_EVENT_ENABLED(XFS_BHVTOI(dir_bdp), DM_EVENT_POSTCREATE)) { DM_EVENT_ENABLED(dp, DM_EVENT_POSTCREATE)) {
(void) XFS_SEND_NAMESP(mp, DM_EVENT_POSTCREATE, (void) XFS_SEND_NAMESP(mp, DM_EVENT_POSTCREATE,
dir_vp, DM_RIGHT_NULL, dir_vp, DM_RIGHT_NULL,
created ? XFS_ITOV(cdp):NULL, created ? XFS_ITOV(cdp):NULL,
...@@ -3015,49 +2931,36 @@ xfs_mkdir( ...@@ -3015,49 +2931,36 @@ xfs_mkdir(
XFS_QM_DQRELE(mp, udqp); XFS_QM_DQRELE(mp, udqp);
XFS_QM_DQRELE(mp, gdqp); XFS_QM_DQRELE(mp, gdqp);
if (!dp_joined_to_trans && (dp != NULL)) { if (unlock_dp_on_error)
xfs_iunlock(dp, XFS_ILOCK_EXCL); xfs_iunlock(dp, XFS_ILOCK_EXCL);
}
goto std_return; goto std_return;
} }
int
/*
* xfs_rmdir
*
*/
STATIC int
xfs_rmdir( xfs_rmdir(
bhv_desc_t *dir_bdp, xfs_inode_t *dp,
bhv_vname_t *dentry, bhv_vname_t *dentry)
cred_t *credp)
{ {
bhv_vnode_t *dir_vp = XFS_ITOV(dp);
char *name = VNAME(dentry); char *name = VNAME(dentry);
xfs_inode_t *dp; int namelen = VNAMELEN(dentry);
xfs_inode_t *cdp; /* child directory */ xfs_mount_t *mp = dp->i_mount;
xfs_inode_t *cdp; /* child directory */
xfs_trans_t *tp; xfs_trans_t *tp;
xfs_mount_t *mp;
int error; int error;
xfs_bmap_free_t free_list; xfs_bmap_free_t free_list;
xfs_fsblock_t first_block; xfs_fsblock_t first_block;
int cancel_flags; int cancel_flags;
int committed; int committed;
bhv_vnode_t *dir_vp;
int dm_di_mode = S_IFDIR; int dm_di_mode = S_IFDIR;
int last_cdp_link; int last_cdp_link;
int namelen;
uint resblks; uint resblks;
dir_vp = BHV_TO_VNODE(dir_bdp);
dp = XFS_BHVTOI(dir_bdp);
mp = dp->i_mount;
vn_trace_entry(dir_vp, __FUNCTION__, (inst_t *)__return_address); vn_trace_entry(dir_vp, __FUNCTION__, (inst_t *)__return_address);
if (XFS_FORCED_SHUTDOWN(XFS_BHVTOI(dir_bdp)->i_mount)) if (XFS_FORCED_SHUTDOWN(mp))
return XFS_ERROR(EIO); return XFS_ERROR(EIO);
namelen = VNAMELEN(dentry);
if (!xfs_get_dir_entry(dentry, &cdp)) { if (!xfs_get_dir_entry(dentry, &cdp)) {
dm_di_mode = cdp->i_d.di_mode; dm_di_mode = cdp->i_d.di_mode;
...@@ -3272,25 +3175,24 @@ xfs_rmdir( ...@@ -3272,25 +3175,24 @@ xfs_rmdir(
goto std_return; goto std_return;
} }
STATIC int int
xfs_symlink( xfs_symlink(
bhv_desc_t *dir_bdp, xfs_inode_t *dp,
bhv_vname_t *dentry, bhv_vname_t *dentry,
bhv_vattr_t *vap, bhv_vattr_t *vap,
char *target_path, char *target_path,
bhv_vnode_t **vpp, bhv_vnode_t **vpp,
cred_t *credp) cred_t *credp)
{ {
bhv_vnode_t *dir_vp = XFS_ITOV(dp);
xfs_mount_t *mp = dp->i_mount;
xfs_trans_t *tp; xfs_trans_t *tp;
xfs_mount_t *mp;
xfs_inode_t *dp;
xfs_inode_t *ip; xfs_inode_t *ip;
int error; int error;
int pathlen; int pathlen;
xfs_bmap_free_t free_list; xfs_bmap_free_t free_list;
xfs_fsblock_t first_block; xfs_fsblock_t first_block;
boolean_t dp_joined_to_trans; boolean_t unlock_dp_on_error = B_FALSE;
bhv_vnode_t *dir_vp;
uint cancel_flags; uint cancel_flags;
int committed; int committed;
xfs_fileoff_t first_fsb; xfs_fileoff_t first_fsb;
...@@ -3309,16 +3211,12 @@ xfs_symlink( ...@@ -3309,16 +3211,12 @@ xfs_symlink(
int link_namelen; int link_namelen;
*vpp = NULL; *vpp = NULL;
dir_vp = BHV_TO_VNODE(dir_bdp);
dp = XFS_BHVTOI(dir_bdp);
dp_joined_to_trans = B_FALSE;
error = 0; error = 0;
ip = NULL; ip = NULL;
tp = NULL; tp = NULL;
vn_trace_entry(dir_vp, __FUNCTION__, (inst_t *)__return_address); vn_trace_entry(dir_vp, __FUNCTION__, (inst_t *)__return_address);
mp = dp->i_mount;
if (XFS_FORCED_SHUTDOWN(mp)) if (XFS_FORCED_SHUTDOWN(mp))
return XFS_ERROR(EIO); return XFS_ERROR(EIO);
...@@ -3404,11 +3302,11 @@ xfs_symlink( ...@@ -3404,11 +3302,11 @@ xfs_symlink(
} }
if (error) { if (error) {
cancel_flags = 0; cancel_flags = 0;
dp = NULL;
goto error_return; goto error_return;
} }
xfs_ilock(dp, XFS_ILOCK_EXCL | XFS_ILOCK_PARENT); xfs_ilock(dp, XFS_ILOCK_EXCL | XFS_ILOCK_PARENT);
unlock_dp_on_error = B_TRUE;
/* /*
* Check whether the directory allows new symlinks or not. * Check whether the directory allows new symlinks or not.
...@@ -3449,9 +3347,14 @@ xfs_symlink( ...@@ -3449,9 +3347,14 @@ xfs_symlink(
} }
ITRACE(ip); ITRACE(ip);
/*
* An error after we've joined dp to the transaction will result in the
* transaction cancel unlocking dp so don't do it explicitly in the
* error path.
*/
VN_HOLD(dir_vp); VN_HOLD(dir_vp);
xfs_trans_ijoin(tp, dp, XFS_ILOCK_EXCL); xfs_trans_ijoin(tp, dp, XFS_ILOCK_EXCL);
dp_joined_to_trans = B_TRUE; unlock_dp_on_error = B_FALSE;
/* /*
* Also attach the dquot(s) to it, if applicable. * Also attach the dquot(s) to it, if applicable.
...@@ -3557,7 +3460,7 @@ xfs_symlink( ...@@ -3557,7 +3460,7 @@ xfs_symlink(
/* Fall through to std_return with error = 0 or errno from /* Fall through to std_return with error = 0 or errno from
* xfs_trans_commit */ * xfs_trans_commit */
std_return: std_return:
if (DM_EVENT_ENABLED(XFS_BHVTOI(dir_bdp), DM_EVENT_POSTSYMLINK)) { if (DM_EVENT_ENABLED(dp, DM_EVENT_POSTSYMLINK)) {
(void) XFS_SEND_NAMESP(mp, DM_EVENT_POSTSYMLINK, (void) XFS_SEND_NAMESP(mp, DM_EVENT_POSTSYMLINK,
dir_vp, DM_RIGHT_NULL, dir_vp, DM_RIGHT_NULL,
error ? NULL : XFS_ITOV(ip), error ? NULL : XFS_ITOV(ip),
...@@ -3584,9 +3487,8 @@ xfs_symlink( ...@@ -3584,9 +3487,8 @@ xfs_symlink(
XFS_QM_DQRELE(mp, udqp); XFS_QM_DQRELE(mp, udqp);
XFS_QM_DQRELE(mp, gdqp); XFS_QM_DQRELE(mp, gdqp);
if (!dp_joined_to_trans && (dp != NULL)) { if (unlock_dp_on_error)
xfs_iunlock(dp, XFS_ILOCK_EXCL); xfs_iunlock(dp, XFS_ILOCK_EXCL);
}
goto std_return; goto std_return;
} }
...@@ -3598,20 +3500,16 @@ xfs_symlink( ...@@ -3598,20 +3500,16 @@ xfs_symlink(
* A fid routine that takes a pointer to a previously allocated * A fid routine that takes a pointer to a previously allocated
* fid structure (like xfs_fast_fid) but uses a 64 bit inode number. * fid structure (like xfs_fast_fid) but uses a 64 bit inode number.
*/ */
STATIC int int
xfs_fid2( xfs_fid2(
bhv_desc_t *bdp, xfs_inode_t *ip,
fid_t *fidp) fid_t *fidp)
{ {
xfs_inode_t *ip; xfs_fid2_t *xfid = (xfs_fid2_t *)fidp;
xfs_fid2_t *xfid;
vn_trace_entry(BHV_TO_VNODE(bdp), __FUNCTION__, vn_trace_entry(XFS_ITOV(ip), __FUNCTION__, (inst_t *)__return_address);
(inst_t *)__return_address);
ASSERT(sizeof(fid_t) >= sizeof(xfs_fid2_t)); ASSERT(sizeof(fid_t) >= sizeof(xfs_fid2_t));
xfid = (xfs_fid2_t *)fidp;
ip = XFS_BHVTOI(bdp);
xfid->fid_len = sizeof(xfs_fid2_t) - sizeof(xfid->fid_len); xfid->fid_len = sizeof(xfs_fid2_t) - sizeof(xfid->fid_len);
xfid->fid_pad = 0; xfid->fid_pad = 0;
/* /*
...@@ -3625,21 +3523,13 @@ xfs_fid2( ...@@ -3625,21 +3523,13 @@ xfs_fid2(
} }
/*
* xfs_rwlock
*/
int int
xfs_rwlock( xfs_rwlock(
bhv_desc_t *bdp, xfs_inode_t *ip,
bhv_vrwlock_t locktype) bhv_vrwlock_t locktype)
{ {
xfs_inode_t *ip; if (S_ISDIR(ip->i_d.di_mode))
bhv_vnode_t *vp;
vp = BHV_TO_VNODE(bdp);
if (VN_ISDIR(vp))
return 1; return 1;
ip = XFS_BHVTOI(bdp);
if (locktype == VRWLOCK_WRITE) { if (locktype == VRWLOCK_WRITE) {
xfs_ilock(ip, XFS_IOLOCK_EXCL); xfs_ilock(ip, XFS_IOLOCK_EXCL);
} else if (locktype == VRWLOCK_TRY_READ) { } else if (locktype == VRWLOCK_TRY_READ) {
...@@ -3656,21 +3546,13 @@ xfs_rwlock( ...@@ -3656,21 +3546,13 @@ xfs_rwlock(
} }
/*
* xfs_rwunlock
*/
void void
xfs_rwunlock( xfs_rwunlock(
bhv_desc_t *bdp, xfs_inode_t *ip,
bhv_vrwlock_t locktype) bhv_vrwlock_t locktype)
{ {
xfs_inode_t *ip; if (S_ISDIR(ip->i_d.di_mode))
bhv_vnode_t *vp; return;
vp = BHV_TO_VNODE(bdp);
if (VN_ISDIR(vp))
return;
ip = XFS_BHVTOI(bdp);
if (locktype == VRWLOCK_WRITE) { if (locktype == VRWLOCK_WRITE) {
/* /*
* In the write case, we may have added a new entry to * In the write case, we may have added a new entry to
...@@ -3688,20 +3570,16 @@ xfs_rwunlock( ...@@ -3688,20 +3570,16 @@ xfs_rwunlock(
return; return;
} }
STATIC int
int
xfs_inode_flush( xfs_inode_flush(
bhv_desc_t *bdp, xfs_inode_t *ip,
int flags) int flags)
{ {
xfs_inode_t *ip; xfs_mount_t *mp = ip->i_mount;
xfs_mount_t *mp; xfs_inode_log_item_t *iip = ip->i_itemp;
xfs_inode_log_item_t *iip;
int error = 0; int error = 0;
ip = XFS_BHVTOI(bdp);
mp = ip->i_mount;
iip = ip->i_itemp;
if (XFS_FORCED_SHUTDOWN(mp)) if (XFS_FORCED_SHUTDOWN(mp))
return XFS_ERROR(EIO); return XFS_ERROR(EIO);
...@@ -3770,24 +3648,20 @@ xfs_inode_flush( ...@@ -3770,24 +3648,20 @@ xfs_inode_flush(
return error; return error;
} }
int int
xfs_set_dmattrs ( xfs_set_dmattrs(
bhv_desc_t *bdp, xfs_inode_t *ip,
u_int evmask, u_int evmask,
u_int16_t state, u_int16_t state)
cred_t *credp)
{ {
xfs_inode_t *ip; xfs_mount_t *mp = ip->i_mount;
xfs_trans_t *tp; xfs_trans_t *tp;
xfs_mount_t *mp;
int error; int error;
if (!capable(CAP_SYS_ADMIN)) if (!capable(CAP_SYS_ADMIN))
return XFS_ERROR(EPERM); return XFS_ERROR(EPERM);
ip = XFS_BHVTOI(bdp);
mp = ip->i_mount;
if (XFS_FORCED_SHUTDOWN(mp)) if (XFS_FORCED_SHUTDOWN(mp))
return XFS_ERROR(EIO); return XFS_ERROR(EIO);
...@@ -3810,15 +3684,11 @@ xfs_set_dmattrs ( ...@@ -3810,15 +3684,11 @@ xfs_set_dmattrs (
return error; return error;
} }
STATIC int int
xfs_reclaim( xfs_reclaim(
bhv_desc_t *bdp) xfs_inode_t *ip)
{ {
xfs_inode_t *ip; bhv_vnode_t *vp = XFS_ITOV(ip);
bhv_vnode_t *vp;
vp = BHV_TO_VNODE(bdp);
ip = XFS_BHVTOI(bdp);
vn_trace_entry(vp, __FUNCTION__, (inst_t *)__return_address); vn_trace_entry(vp, __FUNCTION__, (inst_t *)__return_address);
...@@ -4495,35 +4365,29 @@ xfs_free_file_space( ...@@ -4495,35 +4365,29 @@ xfs_free_file_space(
*/ */
int int
xfs_change_file_space( xfs_change_file_space(
bhv_desc_t *bdp, xfs_inode_t *ip,
int cmd, int cmd,
xfs_flock64_t *bf, xfs_flock64_t *bf,
xfs_off_t offset, xfs_off_t offset,
cred_t *credp, cred_t *credp,
int attr_flags) int attr_flags)
{ {
xfs_mount_t *mp = ip->i_mount;
int clrprealloc; int clrprealloc;
int error; int error;
xfs_fsize_t fsize; xfs_fsize_t fsize;
xfs_inode_t *ip;
xfs_mount_t *mp;
int setprealloc; int setprealloc;
xfs_off_t startoffset; xfs_off_t startoffset;
xfs_off_t llen; xfs_off_t llen;
xfs_trans_t *tp; xfs_trans_t *tp;
bhv_vattr_t va; bhv_vattr_t va;
bhv_vnode_t *vp;
vp = BHV_TO_VNODE(bdp);
vn_trace_entry(vp, __FUNCTION__, (inst_t *)__return_address);
ip = XFS_BHVTOI(bdp); vn_trace_entry(XFS_ITOV(ip), __FUNCTION__, (inst_t *)__return_address);
mp = ip->i_mount;
/* /*
* must be a regular file and have write permission * must be a regular file and have write permission
*/ */
if (!VN_ISREG(vp)) if (!S_ISREG(ip->i_d.di_mode))
return XFS_ERROR(EINVAL); return XFS_ERROR(EINVAL);
xfs_ilock(ip, XFS_ILOCK_SHARED); xfs_ilock(ip, XFS_ILOCK_SHARED);
...@@ -4605,7 +4469,7 @@ xfs_change_file_space( ...@@ -4605,7 +4469,7 @@ xfs_change_file_space(
va.va_mask = XFS_AT_SIZE; va.va_mask = XFS_AT_SIZE;
va.va_size = startoffset; va.va_size = startoffset;
error = xfs_setattr(bdp, &va, attr_flags, credp); error = xfs_setattr(ip, &va, attr_flags, credp);
if (error) if (error)
return error; return error;
...@@ -4664,46 +4528,3 @@ xfs_change_file_space( ...@@ -4664,46 +4528,3 @@ xfs_change_file_space(
return error; return error;
} }
bhv_vnodeops_t xfs_vnodeops = {
BHV_IDENTITY_INIT(VN_BHV_XFS,VNODE_POSITION_XFS),
.vop_open = xfs_open,
.vop_read = xfs_read,
#ifdef HAVE_SPLICE
.vop_splice_read = xfs_splice_read,
.vop_splice_write = xfs_splice_write,
#endif
.vop_write = xfs_write,
.vop_ioctl = xfs_ioctl,
.vop_getattr = xfs_getattr,
.vop_setattr = xfs_setattr,
.vop_access = xfs_access,
.vop_lookup = xfs_lookup,
.vop_create = xfs_create,
.vop_remove = xfs_remove,
.vop_link = xfs_link,
.vop_rename = xfs_rename,
.vop_mkdir = xfs_mkdir,
.vop_rmdir = xfs_rmdir,
.vop_readdir = xfs_readdir,
.vop_symlink = xfs_symlink,
.vop_readlink = xfs_readlink,
.vop_fsync = xfs_fsync,
.vop_inactive = xfs_inactive,
.vop_fid2 = xfs_fid2,
.vop_rwlock = xfs_rwlock,
.vop_rwunlock = xfs_rwunlock,
.vop_bmap = xfs_bmap,
.vop_reclaim = xfs_reclaim,
.vop_attr_get = xfs_attr_get,
.vop_attr_set = xfs_attr_set,
.vop_attr_remove = xfs_attr_remove,
.vop_attr_list = xfs_attr_list,
.vop_link_removed = (vop_link_removed_t)fs_noval,
.vop_vnode_change = (vop_vnode_change_t)fs_noval,
.vop_tosspages = fs_tosspages,
.vop_flushinval_pages = fs_flushinval_pages,
.vop_flush_pages = fs_flush_pages,
.vop_release = xfs_release,
.vop_iflush = xfs_inode_flush,
};
fs/xfs/xfs_vnodeops.h 0 → 100644
View file @ 993386c1
#ifndef _XFS_VNODEOPS_H
#define _XFS_VNODEOPS_H 1
struct attrlist_cursor_kern;
struct bhv_vattr;
struct cred;
struct file;
struct inode;
struct iovec;
struct kiocb;
struct pipe_inode_info;
struct uio;
struct xfs_inode;
struct xfs_iomap;
int xfs_open(struct xfs_inode *ip);
int xfs_getattr(struct xfs_inode *ip, struct bhv_vattr *vap, int flags);
int xfs_setattr(struct xfs_inode *ip, struct bhv_vattr *vap, int flags,
struct cred *credp);
int xfs_access(struct xfs_inode *ip, int mode, struct cred *credp);
int xfs_readlink(struct xfs_inode *ip, char *link);
int xfs_fsync(struct xfs_inode *ip, int flag, xfs_off_t start,
xfs_off_t stop);
int xfs_release(struct xfs_inode *ip);
int xfs_inactive(struct xfs_inode *ip);
int xfs_lookup(struct xfs_inode *dp, bhv_vname_t *dentry,
bhv_vnode_t **vpp);
int xfs_create(struct xfs_inode *dp, bhv_vname_t *dentry,
struct bhv_vattr *vap, bhv_vnode_t **vpp, struct cred *credp);
int xfs_remove(struct xfs_inode *dp, bhv_vname_t *dentry);
int xfs_link(struct xfs_inode *tdp, bhv_vnode_t *src_vp,
bhv_vname_t *dentry);
int xfs_mkdir(struct xfs_inode *dp, bhv_vname_t *dentry,
struct bhv_vattr *vap, bhv_vnode_t **vpp, struct cred *credp);
int xfs_rmdir(struct xfs_inode *dp, bhv_vname_t *dentry);
int xfs_readdir(struct xfs_inode *dp, void *dirent, size_t bufsize,
xfs_off_t *offset, filldir_t filldir);
int xfs_symlink(struct xfs_inode *dp, bhv_vname_t *dentry,
struct bhv_vattr *vap, char *target_path,
bhv_vnode_t **vpp, struct cred *credp);
int xfs_fid2(struct xfs_inode *ip, fid_t *fidp);
int xfs_rwlock(struct xfs_inode *ip, bhv_vrwlock_t locktype);
void xfs_rwunlock(struct xfs_inode *ip, bhv_vrwlock_t locktype);
int xfs_inode_flush(struct xfs_inode *ip, int flags);
int xfs_set_dmattrs(struct xfs_inode *ip, u_int evmask, u_int16_t state);
int xfs_reclaim(struct xfs_inode *ip);
int xfs_change_file_space(struct xfs_inode *ip, int cmd,
xfs_flock64_t *bf, xfs_off_t offset,
struct cred *credp, int attr_flags);
int xfs_rename(struct xfs_inode *src_dp, bhv_vname_t *src_vname,
bhv_vnode_t *target_dir_vp, bhv_vname_t *target_vname);
int xfs_attr_get(struct xfs_inode *ip, const char *name, char *value,
int *valuelenp, int flags, cred_t *cred);
int xfs_attr_set(struct xfs_inode *dp, const char *name, char *value,
int valuelen, int flags);
int xfs_attr_remove(struct xfs_inode *dp, const char *name, int flags);
int xfs_attr_list(struct xfs_inode *dp, char *buffer, int bufsize,
int flags, struct attrlist_cursor_kern *cursor);
int xfs_ioctl(struct xfs_inode *ip, struct file *filp,
int ioflags, unsigned int cmd, void __user *arg);
ssize_t xfs_read(struct xfs_inode *ip, struct kiocb *iocb,
const struct iovec *iovp, unsigned int segs,
loff_t *offset, int ioflags);
ssize_t xfs_sendfile(struct xfs_inode *ip, struct file *filp,
loff_t *offset, int ioflags, size_t count,
read_actor_t actor, void *target);
ssize_t xfs_splice_read(struct xfs_inode *ip, struct file *infilp,
loff_t *ppos, struct pipe_inode_info *pipe, size_t count,
int flags, int ioflags);
ssize_t xfs_splice_write(struct xfs_inode *ip,
struct pipe_inode_info *pipe, struct file *outfilp,
loff_t *ppos, size_t count, int flags, int ioflags);
ssize_t xfs_write(struct xfs_inode *xip, struct kiocb *iocb,
const struct iovec *iovp, unsigned int nsegs,
loff_t *offset, int ioflags);
int xfs_bmap(struct xfs_inode *ip, xfs_off_t offset, ssize_t count,
int flags, struct xfs_iomap *iomapp, int *niomaps);
void xfs_tosspages(struct xfs_inode *inode, xfs_off_t first,
xfs_off_t last, int fiopt);
int xfs_flushinval_pages(struct xfs_inode *ip, xfs_off_t first,
xfs_off_t last, int fiopt);
int xfs_flush_pages(struct xfs_inode *ip, xfs_off_t first,
xfs_off_t last, uint64_t flags, int fiopt);
#endif /* _XFS_VNODEOPS_H */
fs/xfs/xfs_vnodeops_bhv.c 0 → 100644
View file @ 993386c1
#include "xfs_linux.h"
#include "xfs_vnodeops.h"
#include "xfs_bmap_btree.h"
#include "xfs_inode.h"
STATIC int
xfs_bhv_open(
bhv_desc_t *bdp,
cred_t *credp)
{
return xfs_open(XFS_BHVTOI(bdp));
}
STATIC int
xfs_bhv_getattr(
bhv_desc_t *bdp,
bhv_vattr_t *vap,
int flags,
cred_t *credp)
{
return xfs_getattr(XFS_BHVTOI(bdp), vap, flags);
}
int
xfs_bhv_setattr(
bhv_desc_t *bdp,
bhv_vattr_t *vap,
int flags,
cred_t *credp)
{
return xfs_setattr(XFS_BHVTOI(bdp), vap, flags, credp);
}
STATIC int
xfs_bhv_access(
bhv_desc_t *bdp,
int mode,
cred_t *credp)
{
return xfs_access(XFS_BHVTOI(bdp), mode, credp);
}
STATIC int
xfs_bhv_readlink(
bhv_desc_t *bdp,
char *link)
{
return xfs_readlink(XFS_BHVTOI(bdp), link);
}
STATIC int
xfs_bhv_fsync(
bhv_desc_t *bdp,
int flag,
cred_t *credp,
xfs_off_t start,
xfs_off_t stop)
{
return xfs_fsync(XFS_BHVTOI(bdp), flag, start, stop);
}
STATIC int
xfs_bhv_release(
bhv_desc_t *bdp)
{
return xfs_release(XFS_BHVTOI(bdp));
}
STATIC int
xfs_bhv_inactive(
bhv_desc_t *bdp,
cred_t *credp)
{
return xfs_inactive(XFS_BHVTOI(bdp));
}
STATIC int
xfs_bhv_lookup(
bhv_desc_t *dir_bdp,
bhv_vname_t *dentry,
bhv_vnode_t **vpp,
int flags,
bhv_vnode_t *rdir,
cred_t *credp)
{
return xfs_lookup(XFS_BHVTOI(dir_bdp), dentry, vpp);
}
STATIC int
xfs_bhv_create(
bhv_desc_t *dir_bdp,
bhv_vname_t *dentry,
bhv_vattr_t *vap,
bhv_vnode_t **vpp,
cred_t *credp)
{
return xfs_create(XFS_BHVTOI(dir_bdp), dentry, vap, vpp, credp);
}
STATIC int
xfs_bhv_remove(
bhv_desc_t *dir_bdp,
bhv_vname_t *dentry,
cred_t *credp)
{
return xfs_remove(XFS_BHVTOI(dir_bdp), dentry);
}
STATIC int
xfs_bhv_link(
bhv_desc_t *target_dir_bdp,
bhv_vnode_t *src_vp,
bhv_vname_t *dentry,
cred_t *credp)
{
return xfs_link(XFS_BHVTOI(target_dir_bdp), src_vp, dentry);
}
STATIC int
xfs_bhv_mkdir(
bhv_desc_t *dir_bdp,
bhv_vname_t *dentry,
bhv_vattr_t *vap,
bhv_vnode_t **vpp,
cred_t *credp)
{
return xfs_mkdir(XFS_BHVTOI(dir_bdp), dentry, vap, vpp, credp);
}
STATIC int
xfs_bhv_rmdir(
bhv_desc_t *dir_bdp,
bhv_vname_t *dentry,
cred_t *credp)
{
return xfs_rmdir(XFS_BHVTOI(dir_bdp), dentry);
}
STATIC int
xfs_bhv_readdir(
bhv_desc_t *dir_bdp,
void *dirent,
size_t bufsize,
xfs_off_t *offset,
filldir_t filldir)
{
return xfs_readdir(XFS_BHVTOI(dir_bdp), dirent, bufsize, offset, filldir);
}
STATIC int
xfs_bhv_symlink(
bhv_desc_t *dir_bdp,
bhv_vname_t *dentry,
bhv_vattr_t *vap,
char *target_path,
bhv_vnode_t **vpp,
cred_t *credp)
{
return xfs_symlink(XFS_BHVTOI(dir_bdp), dentry, vap, target_path, vpp, credp);
}
STATIC int
xfs_bhv_fid2(
bhv_desc_t *bdp,
fid_t *fidp)
{
return xfs_fid2(XFS_BHVTOI(bdp), fidp);
}
STATIC int
xfs_bhv_rwlock(
bhv_desc_t *bdp,
bhv_vrwlock_t locktype)
{
return xfs_rwlock(XFS_BHVTOI(bdp), locktype);
}
STATIC void
xfs_bhv_rwunlock(
bhv_desc_t *bdp,
bhv_vrwlock_t locktype)
{
xfs_rwunlock(XFS_BHVTOI(bdp), locktype);
}
STATIC int
xfs_bhv_inode_flush(
bhv_desc_t *bdp,
int flags)
{
return xfs_inode_flush(XFS_BHVTOI(bdp), flags);
}
STATIC int
xfs_bhv_reclaim(
bhv_desc_t *bdp)
{
return xfs_reclaim(XFS_BHVTOI(bdp));
}
STATIC int
xfs_bhv_rename(
bhv_desc_t *src_dir_bdp,
bhv_vname_t *src_vname,
bhv_vnode_t *target_dir_vp,
bhv_vname_t *target_vname,
cred_t *credp)
{
return xfs_rename(XFS_BHVTOI(src_dir_bdp), src_vname,
target_dir_vp, target_vname);
}
STATIC int
xfs_bhv_attr_get(
bhv_desc_t *bdp,
const char *name,
char *value,
int *valuelenp,
int flags,
cred_t *cred)
{
return xfs_attr_get(XFS_BHVTOI(bdp), name, value, valuelenp,
flags, cred);
}
STATIC int
xfs_bhv_attr_set(
bhv_desc_t *bdp,
const char *name,
char *value,
int valuelen,
int flags,
cred_t *cred)
{
return xfs_attr_set(XFS_BHVTOI(bdp), name, value, valuelen,
flags);
}
STATIC int
xfs_bhv_attr_remove(
bhv_desc_t *bdp,
const char *name,
int flags,
cred_t *cred)
{
return xfs_attr_remove(XFS_BHVTOI(bdp), name, flags);
}
STATIC int
xfs_bhv_attr_list(
bhv_desc_t *bdp,
char *buffer,
int bufsize,
int flags,
struct attrlist_cursor_kern *cursor,
cred_t *cred)
{
return xfs_attr_list(XFS_BHVTOI(bdp), buffer, bufsize, flags,
cursor);
}
STATIC int
xfs_bhv_ioctl(
bhv_desc_t *bdp,
struct inode *inode,
struct file *filp,
int ioflags,
unsigned int cmd,
void __user *arg)
{
return xfs_ioctl(XFS_BHVTOI(bdp), filp, ioflags, cmd, arg);
}
STATIC ssize_t
xfs_bhv_read(
bhv_desc_t *bdp,
struct kiocb *iocb,
const struct iovec *iovp,
unsigned int segs,
loff_t *offset,
int ioflags,
cred_t *credp)
{
return xfs_read(XFS_BHVTOI(bdp), iocb, iovp, segs,
offset, ioflags);
}
STATIC ssize_t
xfs_bhv_sendfile(
bhv_desc_t *bdp,
struct file *filp,
loff_t *offset,
int ioflags,
size_t count,
read_actor_t actor,
void *target,
cred_t *credp)
{
return xfs_sendfile(XFS_BHVTOI(bdp), filp, offset, ioflags,
count, actor, target);
}
STATIC ssize_t
xfs_bhv_splice_read(
bhv_desc_t *bdp,
struct file *infilp,
loff_t *ppos,
struct pipe_inode_info *pipe,
size_t count,
int flags,
int ioflags,
cred_t *credp)
{
return xfs_splice_read(XFS_BHVTOI(bdp), infilp, ppos, pipe,
count, flags, ioflags);
}
STATIC ssize_t
xfs_bhv_splice_write(
bhv_desc_t *bdp,
struct pipe_inode_info *pipe,
struct file *outfilp,
loff_t *ppos,
size_t count,
int flags,
int ioflags,
cred_t *credp)
{
return xfs_splice_write(XFS_BHVTOI(bdp), pipe, outfilp, ppos,
count, flags, ioflags);
}
STATIC ssize_t
xfs_bhv_write(
bhv_desc_t *bdp,
struct kiocb *iocb,
const struct iovec *iovp,
unsigned int nsegs,
loff_t *offset,
int ioflags,
cred_t *credp)
{
return xfs_write(XFS_BHVTOI(bdp), iocb, iovp, nsegs, offset,
ioflags);
}
STATIC int
xfs_bhv_bmap(bhv_desc_t *bdp,
xfs_off_t offset,
ssize_t count,
int flags,
struct xfs_iomap *iomapp,
int *niomaps)
{
return xfs_bmap(XFS_BHVTOI(bdp), offset, count, flags,
iomapp, niomaps);
}
STATIC void
fs_tosspages(
bhv_desc_t *bdp,
xfs_off_t first,
xfs_off_t last,
int fiopt)
{
xfs_tosspages(XFS_BHVTOI(bdp), first, last, fiopt);
}
STATIC int
fs_flushinval_pages(
bhv_desc_t *bdp,
xfs_off_t first,
xfs_off_t last,
int fiopt)
{
return xfs_flushinval_pages(XFS_BHVTOI(bdp), first, last,
fiopt);
}
STATIC int
fs_flush_pages(
bhv_desc_t *bdp,
xfs_off_t first,
xfs_off_t last,
uint64_t flags,
int fiopt)
{
return xfs_flush_pages(XFS_BHVTOI(bdp), first, last, flags,
fiopt);
}
bhv_vnodeops_t xfs_vnodeops = {
BHV_IDENTITY_INIT(VN_BHV_XFS,VNODE_POSITION_XFS),
.vop_open = xfs_bhv_open,
.vop_read = xfs_bhv_read,
#ifdef HAVE_SENDFILE
.vop_sendfile = xfs_bhv_sendfile,
#endif
#ifdef HAVE_SPLICE
.vop_splice_read = xfs_bhv_splice_read,
.vop_splice_write = xfs_bhv_splice_write,
#endif
.vop_write = xfs_bhv_write,
.vop_ioctl = xfs_bhv_ioctl,
.vop_getattr = xfs_bhv_getattr,
.vop_setattr = xfs_bhv_setattr,
.vop_access = xfs_bhv_access,
.vop_lookup = xfs_bhv_lookup,
.vop_create = xfs_bhv_create,
.vop_remove = xfs_bhv_remove,
.vop_link = xfs_bhv_link,
.vop_rename = xfs_bhv_rename,
.vop_mkdir = xfs_bhv_mkdir,
.vop_rmdir = xfs_bhv_rmdir,
.vop_readdir = xfs_bhv_readdir,
.vop_symlink = xfs_bhv_symlink,
.vop_readlink = xfs_bhv_readlink,
.vop_fsync = xfs_bhv_fsync,
.vop_inactive = xfs_bhv_inactive,
.vop_fid2 = xfs_bhv_fid2,
.vop_rwlock = xfs_bhv_rwlock,
.vop_rwunlock = xfs_bhv_rwunlock,
.vop_bmap = xfs_bhv_bmap,
.vop_reclaim = xfs_bhv_reclaim,
.vop_attr_get = xfs_bhv_attr_get,
.vop_attr_set = xfs_bhv_attr_set,
.vop_attr_remove = xfs_bhv_attr_remove,
.vop_attr_list = xfs_bhv_attr_list,
.vop_link_removed = (vop_link_removed_t)fs_noval,
.vop_vnode_change = (vop_vnode_change_t)fs_noval,
.vop_tosspages = fs_tosspages,
.vop_flushinval_pages = fs_flushinval_pages,
.vop_flush_pages = fs_flush_pages,
.vop_release = xfs_bhv_release,
.vop_iflush = xfs_bhv_inode_flush,
};
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7