Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 29 insertions, 35 deletions

diff --git a/fs/xfs/xfs_dir2.c b/fs/xfs/xfs_dir2.c
index be7c4251fa61..7cb26529766b 100644
--- a/fs/xfs/xfs_dir2.c
+++ b/fs/xfs/xfs_dir2.c
@@ -44,12 +44,13 @@
 #include "xfs_error.h"
 #include "xfs_vnodeops.h"
 
+struct xfs_name xfs_name_dotdot = {"..", 2};
 
 void
 xfs_dir_mount(
         xfs_mount_t     *mp)
 {
-        ASSERT(XFS_SB_VERSION_HASDIRV2(&mp->m_sb));
+        ASSERT(xfs_sb_version_hasdirv2(&mp->m_sb));
         ASSERT((1 << (mp->m_sb.sb_blocklog + mp->m_sb.sb_dirblklog)) <=
                XFS_MAX_BLOCKSIZE);
         mp->m_dirblksize = 1 << (mp->m_sb.sb_blocklog + mp->m_sb.sb_dirblklog);
@@ -146,8 +147,7 @@ int
 xfs_dir_createname(
         xfs_trans_t             *tp,
         xfs_inode_t             *dp,
-        char                    *name,
-        int                     namelen,
+        struct xfs_name         *name,
         xfs_ino_t               inum,           /* new entry inode number */
         xfs_fsblock_t           *first,         /* bmap's firstblock */
         xfs_bmap_free_t         *flist,         /* bmap's freeblock list */
@@ -162,9 +162,9 @@ xfs_dir_createname(
                 return rval;
         XFS_STATS_INC(xs_dir_create);
 
-        args.name = name;
-        args.namelen = namelen;
-        args.hashval = xfs_da_hashname(name, namelen);
+        args.name = name->name;
+        args.namelen = name->len;
+        args.hashval = xfs_da_hashname(name->name, name->len);
         args.inumber = inum;
         args.dp = dp;
         args.firstblock = first;
@@ -197,8 +197,7 @@ int
 xfs_dir_lookup(
         xfs_trans_t     *tp,
         xfs_inode_t     *dp,
-        char            *name,
-        int             namelen,
+        struct xfs_name *name,
         xfs_ino_t       *inum)          /* out: inode number */
 {
         xfs_da_args_t   args;
@@ -207,18 +206,14 @@ xfs_dir_lookup(
 
         ASSERT((dp->i_d.di_mode & S_IFMT) == S_IFDIR);
         XFS_STATS_INC(xs_dir_lookup);
+        memset(&args, 0, sizeof(xfs_da_args_t));
 
-        args.name = name;
-        args.namelen = namelen;
-        args.hashval = xfs_da_hashname(name, namelen);
-        args.inumber = 0;
+        args.name = name->name;
+        args.namelen = name->len;
+        args.hashval = xfs_da_hashname(name->name, name->len);
         args.dp = dp;
-        args.firstblock = NULL;
-        args.flist = NULL;
-        args.total = 0;
         args.whichfork = XFS_DATA_FORK;
         args.trans = tp;
-        args.justcheck = args.addname = 0;
         args.oknoent = 1;
 
         if (dp->i_d.di_format == XFS_DINODE_FMT_LOCAL)
@@ -247,8 +242,7 @@ int
 xfs_dir_removename(
         xfs_trans_t     *tp,
         xfs_inode_t     *dp,
-        char            *name,
-        int             namelen,
+        struct xfs_name *name,
         xfs_ino_t       ino,
         xfs_fsblock_t   *first,         /* bmap's firstblock */
         xfs_bmap_free_t *flist,         /* bmap's freeblock list */
@@ -261,9 +255,9 @@ xfs_dir_removename(
         ASSERT((dp->i_d.di_mode & S_IFMT) == S_IFDIR);
         XFS_STATS_INC(xs_dir_remove);
 
-        args.name = name;
-        args.namelen = namelen;
-        args.hashval = xfs_da_hashname(name, namelen);
+        args.name = name->name;
+        args.namelen = name->len;
+        args.hashval = xfs_da_hashname(name->name, name->len);
         args.inumber = ino;
         args.dp = dp;
         args.firstblock = first;
@@ -329,8 +323,7 @@ int
 xfs_dir_replace(
         xfs_trans_t     *tp,
         xfs_inode_t     *dp,
-        char            *name,          /* name of entry to replace */
-        int             namelen,
+        struct xfs_name *name,          /* name of entry to replace */
         xfs_ino_t       inum,           /* new inode number */
         xfs_fsblock_t   *first,         /* bmap's firstblock */
         xfs_bmap_free_t *flist,         /* bmap's freeblock list */
@@ -345,9 +338,9 @@ xfs_dir_replace(
         if ((rval = xfs_dir_ino_validate(tp->t_mountp, inum)))
                 return rval;
 
-        args.name = name;
-        args.namelen = namelen;
-        args.hashval = xfs_da_hashname(name, namelen);
+        args.name = name->name;
+        args.namelen = name->len;
+        args.hashval = xfs_da_hashname(name->name, name->len);
         args.inumber = inum;
         args.dp = dp;
         args.firstblock = first;
@@ -374,28 +367,29 @@ xfs_dir_replace(
 
 /*
  * See if this entry can be added to the directory without allocating space.
+ * First checks that the caller couldn't reserve enough space (resblks = 0).
  */
 int
 xfs_dir_canenter(
         xfs_trans_t     *tp,
         xfs_inode_t     *dp,
-        char            *name,          /* name of entry to add */
-        int             namelen)
+        struct xfs_name *name,          /* name of entry to add */
+        uint            resblks)
 {
         xfs_da_args_t   args;
         int             rval;
         int             v;              /* type-checking value */
 
+        if (resblks)
+                return 0;
+
         ASSERT((dp->i_d.di_mode & S_IFMT) == S_IFDIR);
+        memset(&args, 0, sizeof(xfs_da_args_t));
 
-        args.name = name;
-        args.namelen = namelen;
-        args.hashval = xfs_da_hashname(name, namelen);
-        args.inumber = 0;
+        args.name = name->name;
+        args.namelen = name->len;
+        args.hashval = xfs_da_hashname(name->name, name->len);
         args.dp = dp;
-        args.firstblock = NULL;
-        args.flist = NULL;
-        args.total = 0;
         args.whichfork = XFS_DATA_FORK;
         args.trans = tp;
         args.justcheck = args.addname = args.oknoent = 1;