Commit 5510dcc8 authored by Nathan Scott's avatar Nathan Scott

[XFS] Fix up some comments, tidy up some macros - no functional changes.

SGI Modid: 2.5.x-xfs:slinx:135917a
parent 8f282b93
...@@ -671,13 +671,14 @@ extern void vn_rele(struct vnode *); ...@@ -671,13 +671,14 @@ extern void vn_rele(struct vnode *);
#define VN_HOLD(vp) ((void)vn_hold(vp)) #define VN_HOLD(vp) ((void)vn_hold(vp))
#define VN_RELE(vp) (iput(LINVFS_GET_IP(vp))) #define VN_RELE(vp) (iput(LINVFS_GET_IP(vp)))
#endif /* ! (defined(CONFIG_XFS_VNODE_TRACING) */ #endif /* ! (defined(CONFIG_XFS_VNODE_TRACING)) */
/* /*
* Vname handling macros. * Vname handling macros.
*/ */
#define VNAME(dentry) ((char *) (dentry)->d_name.name) #define VNAME(dentry) ((char *) (dentry)->d_name.name)
#define VNAMELEN(dentry) ((dentry)->d_name.len) #define VNAMELEN(dentry) ((dentry)->d_name.len)
#define VNAME_TO_VNODE(dentry) (LINVFS_GET_VP((dentry)->d_inode))
/* /*
* Vnode spinlock manipulation. * Vnode spinlock manipulation.
......
...@@ -1108,7 +1108,7 @@ _pagebuf_wait_unpin( ...@@ -1108,7 +1108,7 @@ _pagebuf_wait_unpin(
* pagebuf_iodone * pagebuf_iodone
* *
* pagebuf_iodone marks a buffer for which I/O is in progress * pagebuf_iodone marks a buffer for which I/O is in progress
* done with respect to that I/O. The pb_done routine, if * done with respect to that I/O. The pb_iodone routine, if
* present, will be called as a side-effect. * present, will be called as a side-effect.
*/ */
void void
...@@ -1173,7 +1173,7 @@ pagebuf_ioerror( /* mark/clear buffer error flag */ ...@@ -1173,7 +1173,7 @@ pagebuf_ioerror( /* mark/clear buffer error flag */
* pagebuf_iostart initiates I/O on a buffer, based on the flags supplied. * pagebuf_iostart initiates I/O on a buffer, based on the flags supplied.
* If necessary, it will arrange for any disk space allocation required, * If necessary, it will arrange for any disk space allocation required,
* and it will break up the request if the block mappings require it. * and it will break up the request if the block mappings require it.
* An pb_iodone routine in the buffer supplied will only be called * The pb_iodone routine in the buffer supplied will only be called
* when all of the subsidiary I/O requests, if any, have been completed. * when all of the subsidiary I/O requests, if any, have been completed.
* pagebuf_iostart calls the pagebuf_ioinitiate routine or * pagebuf_iostart calls the pagebuf_ioinitiate routine or
* pagebuf_iorequest, if the former routine is not defined, to start * pagebuf_iorequest, if the former routine is not defined, to start
...@@ -1317,7 +1317,7 @@ pagebuf_iorequest( /* start real I/O */ ...@@ -1317,7 +1317,7 @@ pagebuf_iorequest( /* start real I/O */
/* Set the count to 1 initially, this will stop an I/O /* Set the count to 1 initially, this will stop an I/O
* completion callout which happens before we have started * completion callout which happens before we have started
* all the I/O from calling iodone too early * all the I/O from calling pagebuf_iodone too early.
*/ */
atomic_set(&pb->pb_io_remaining, 1); atomic_set(&pb->pb_io_remaining, 1);
......
...@@ -47,9 +47,7 @@ xfs_get_dir_entry( ...@@ -47,9 +47,7 @@ xfs_get_dir_entry(
vnode_t *vp; vnode_t *vp;
bhv_desc_t *bdp; bhv_desc_t *bdp;
ASSERT(dentry->d_inode); vp = VNAME_TO_VNODE(dentry);
vp = LINVFS_GET_VP(dentry->d_inode);
bdp = vn_bhv_lookup_unlocked(VN_BHV_HEAD(vp), &xfs_vnodeops); bdp = vn_bhv_lookup_unlocked(VN_BHV_HEAD(vp), &xfs_vnodeops);
if (!bdp) { if (!bdp) {
*ipp = NULL; *ipp = NULL;
......
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