diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-05-29 10:05:05 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-05-29 10:05:05 -0400 |
| commit | 6715930654e06c4d2e66e718ea159079f71838f4 (patch) | |
| tree | 6a0a19fb62f3e99cb5f6bf6c34ae541f7c30fb42 /fs/xfs/xfs_vnodeops.h | |
| parent | ea3f01f8afd3bc5daff915cc4ea5cc5ea9e7d427 (diff) | |
| parent | e490517a039a99d692cb3a5561941b0a5f576172 (diff) | |
Merge commit 'linus/master' into sched-fixes-for-linus
Diffstat (limited to 'fs/xfs/xfs_vnodeops.h')
| -rw-r--r-- | fs/xfs/xfs_vnodeops.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/xfs/xfs_vnodeops.h b/fs/xfs/xfs_vnodeops.h index 8abe8f186e20..57335ba4ce53 100644 --- a/fs/xfs/xfs_vnodeops.h +++ b/fs/xfs/xfs_vnodeops.h | |||
| @@ -18,8 +18,7 @@ int xfs_open(struct xfs_inode *ip); | |||
| 18 | int xfs_setattr(struct xfs_inode *ip, struct bhv_vattr *vap, int flags, | 18 | int xfs_setattr(struct xfs_inode *ip, struct bhv_vattr *vap, int flags, |
| 19 | struct cred *credp); | 19 | struct cred *credp); |
| 20 | int xfs_readlink(struct xfs_inode *ip, char *link); | 20 | int xfs_readlink(struct xfs_inode *ip, char *link); |
| 21 | int xfs_fsync(struct xfs_inode *ip, int flag, xfs_off_t start, | 21 | int xfs_fsync(struct xfs_inode *ip); |
| 22 | xfs_off_t stop); | ||
| 23 | int xfs_release(struct xfs_inode *ip); | 22 | int xfs_release(struct xfs_inode *ip); |
| 24 | int xfs_inactive(struct xfs_inode *ip); | 23 | int xfs_inactive(struct xfs_inode *ip); |
| 25 | int xfs_lookup(struct xfs_inode *dp, struct xfs_name *name, | 24 | int xfs_lookup(struct xfs_inode *dp, struct xfs_name *name, |