Merge branch 'linus' into timers/urgent

Get upstream changes so we can apply fixes against them

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

1 files changed, 48 insertions, 3 deletions

diff --git a/fs/xfs/xfs_symlink.c b/fs/xfs/xfs_symlink.c
index 195a403e1522..e830fb56e27f 100644
--- a/fs/xfs/xfs_symlink.c
+++ b/fs/xfs/xfs_symlink.c
@@ -358,7 +358,8 @@ xfs_symlink(
         int                     n;
         xfs_buf_t               *bp;
         prid_t                  prid;
-        struct xfs_dquot        *udqp, *gdqp;
+        struct xfs_dquot        *udqp = NULL;
+        struct xfs_dquot        *gdqp = NULL;
         uint                    resblks;
 
         *ipp = NULL;
@@ -585,7 +586,7 @@ xfs_symlink(
 /*
  * Free a symlink that has blocks associated with it.
  */
-int
+STATIC int
 xfs_inactive_symlink_rmt(
         xfs_inode_t     *ip,
         xfs_trans_t     **tpp)
@@ -606,7 +607,7 @@ xfs_inactive_symlink_rmt(
 
         tp = *tpp;
         mp = ip->i_mount;
-        ASSERT(ip->i_d.di_size > XFS_IFORK_DSIZE(ip));
+        ASSERT(ip->i_df.if_flags & XFS_IFEXTENTS);
         /*
          * We're freeing a symlink that has some
          * blocks allocated to it.  Free the
@@ -720,3 +721,47 @@ xfs_inactive_symlink_rmt(
  error0:
         return error;
 }
+
+/*
+ * xfs_inactive_symlink - free a symlink
+ */
+int
+xfs_inactive_symlink(
+        struct xfs_inode        *ip,
+        struct xfs_trans        **tp)
+{
+        struct xfs_mount        *mp = ip->i_mount;
+        int                     pathlen;
+
+        trace_xfs_inactive_symlink(ip);
+
+        ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL));
+
+        if (XFS_FORCED_SHUTDOWN(mp))
+                return XFS_ERROR(EIO);
+
+        /*
+         * Zero length symlinks _can_ exist.
+         */
+        pathlen = (int)ip->i_d.di_size;
+        if (!pathlen)
+                return 0;
+
+        if (pathlen < 0 || pathlen > MAXPATHLEN) {
+                xfs_alert(mp, "%s: inode (0x%llx) bad symlink length (%d)",
+                         __func__, (unsigned long long)ip->i_ino, pathlen);
+                ASSERT(0);
+                return XFS_ERROR(EFSCORRUPTED);
+        }
+
+        if (ip->i_df.if_flags & XFS_IFINLINE) {
+                if (ip->i_df.if_bytes > 0)
+                        xfs_idata_realloc(ip, -(ip->i_df.if_bytes),
+                                          XFS_DATA_FORK);
+                ASSERT(ip->i_df.if_bytes == 0);
+                return 0;
+        }
+
+        /* remove the remote symlink */
+        return xfs_inactive_symlink_rmt(ip, tp);
+}