diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-09-11 08:46:53 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-09-11 08:46:53 -0400 |
commit | 336879b1da97fffc097f77c6d6f818660f2826f0 (patch) | |
tree | 4ddb4d1c5d2b67fb096c72e41d2a03b01a605041 /fs/xfs/libxfs/xfs_inode_buf.h | |
parent | 3d3cbd84300e7be1e53083cac0f6f9c12978ecb4 (diff) | |
parent | fdcaa1dbb7c6ed419b10fb8cdb5001ab0a00538f (diff) |
Merge remote-tracking branch 'airlied/drm-next' into topic/vblank-rework
Dave asked me to do the backmerge before sending him the revised pull
request, so here we go. Nothing fancy in the conflicts, just a few
things changed right next to each another.
Conflicts:
drivers/gpu/drm/drm_irq.c
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'fs/xfs/libxfs/xfs_inode_buf.h')
-rw-r--r-- | fs/xfs/libxfs/xfs_inode_buf.h | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/fs/xfs/libxfs/xfs_inode_buf.h b/fs/xfs/libxfs/xfs_inode_buf.h new file mode 100644 index 000000000000..9308c47f2a52 --- /dev/null +++ b/fs/xfs/libxfs/xfs_inode_buf.h | |||
@@ -0,0 +1,50 @@ | |||
1 | /* | ||
2 | * Copyright (c) 2000-2003,2005 Silicon Graphics, Inc. | ||
3 | * All Rights Reserved. | ||
4 | * | ||
5 | * This program is free software; you can redistribute it and/or | ||
6 | * modify it under the terms of the GNU General Public License as | ||
7 | * published by the Free Software Foundation. | ||
8 | * | ||
9 | * This program is distributed in the hope that it would be useful, | ||
10 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
11 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
12 | * GNU General Public License for more details. | ||
13 | * | ||
14 | * You should have received a copy of the GNU General Public License | ||
15 | * along with this program; if not, write the Free Software Foundation, | ||
16 | * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | ||
17 | */ | ||
18 | #ifndef __XFS_INODE_BUF_H__ | ||
19 | #define __XFS_INODE_BUF_H__ | ||
20 | |||
21 | struct xfs_inode; | ||
22 | struct xfs_dinode; | ||
23 | struct xfs_icdinode; | ||
24 | |||
25 | /* | ||
26 | * Inode location information. Stored in the inode and passed to | ||
27 | * xfs_imap_to_bp() to get a buffer and dinode for a given inode. | ||
28 | */ | ||
29 | struct xfs_imap { | ||
30 | xfs_daddr_t im_blkno; /* starting BB of inode chunk */ | ||
31 | ushort im_len; /* length in BBs of inode chunk */ | ||
32 | ushort im_boffset; /* inode offset in block in bytes */ | ||
33 | }; | ||
34 | |||
35 | int xfs_imap_to_bp(struct xfs_mount *, struct xfs_trans *, | ||
36 | struct xfs_imap *, struct xfs_dinode **, | ||
37 | struct xfs_buf **, uint, uint); | ||
38 | int xfs_iread(struct xfs_mount *, struct xfs_trans *, | ||
39 | struct xfs_inode *, uint); | ||
40 | void xfs_dinode_calc_crc(struct xfs_mount *, struct xfs_dinode *); | ||
41 | void xfs_dinode_to_disk(struct xfs_dinode *to, struct xfs_icdinode *from); | ||
42 | void xfs_dinode_from_disk(struct xfs_icdinode *to, struct xfs_dinode *from); | ||
43 | |||
44 | #if defined(DEBUG) | ||
45 | void xfs_inobp_check(struct xfs_mount *, struct xfs_buf *); | ||
46 | #else | ||
47 | #define xfs_inobp_check(mp, bp) | ||
48 | #endif /* DEBUG */ | ||
49 | |||
50 | #endif /* __XFS_INODE_BUF_H__ */ | ||