Merge uncontroversial parts of branch 'readlink' of git://git.kernel.org/pub/scm...

[karo-tx-linux.git] / fs / xfs / xfs_super.c

diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
index ade4691e3f7403ca65241856b355d0cb0f5709a0..eecbaac08ebaab50f7a5a139e0ae646a7c086d4d 100644 (file)
--- a/fs/xfs/xfs_super.c
+++ b/fs/xfs/xfs_super.c
@@ -104,9 +104,6 @@ static const match_table_t tokens = {
        {Opt_sysvgroups,"sysvgroups"},  /* group-ID from current process */
        {Opt_allocsize, "allocsize=%s"},/* preferred allocation size */
        {Opt_norecovery,"norecovery"},  /* don't run XFS recovery */
-       {Opt_barrier,   "barrier"},     /* use writer barriers for log write and
-                                        * unwritten extent conversion */
-       {Opt_nobarrier, "nobarrier"},   /* .. disable */
        {Opt_inode64,   "inode64"},     /* inodes can be allocated anywhere */
        {Opt_inode32,   "inode32"},     /* inode allocation limited to
                                         * XFS_MAXINUMBER_32 */
@@ -134,6 +131,12 @@ static const match_table_t tokens = {
        {Opt_nodiscard, "nodiscard"},   /* Do not discard unused blocks */
 
        {Opt_dax,       "dax"},         /* Enable direct access to bdev pages */
+
+       /* Deprecated mount options scheduled for removal */
+       {Opt_barrier,   "barrier"},     /* use writer barriers for log write and
+                                        * unwritten extent conversion */
+       {Opt_nobarrier, "nobarrier"},   /* .. disable */
+
        {Opt_err,       NULL},
 };
 
@@ -301,12 +304,6 @@ xfs_parseargs(
                case Opt_nouuid:
                        mp->m_flags |= XFS_MOUNT_NOUUID;
                        break;
-               case Opt_barrier:
-                       mp->m_flags |= XFS_MOUNT_BARRIER;
-                       break;
-               case Opt_nobarrier:
-                       mp->m_flags &= ~XFS_MOUNT_BARRIER;
-                       break;
                case Opt_ikeep:
                        mp->m_flags |= XFS_MOUNT_IKEEP;
                        break;
@@ -374,6 +371,14 @@ xfs_parseargs(
                        mp->m_flags |= XFS_MOUNT_DAX;
                        break;
 #endif
+               case Opt_barrier:
+                       xfs_warn(mp, "%s option is deprecated, ignoring.", p);
+                       mp->m_flags |= XFS_MOUNT_BARRIER;
+                       break;
+               case Opt_nobarrier:
+                       xfs_warn(mp, "%s option is deprecated, ignoring.", p);
+                       mp->m_flags &= ~XFS_MOUNT_BARRIER;
+                       break;
                default:
                        xfs_warn(mp, "unknown mount option [%s].", p);
                        return -EINVAL;
@@ -943,7 +948,7 @@ xfs_fs_destroy_inode(
 
        trace_xfs_destroy_inode(ip);
 
-       ASSERT(!rwsem_is_locked(&ip->i_iolock.mr_lock));
+       ASSERT(!rwsem_is_locked(&inode->i_rwsem));
        XFS_STATS_INC(ip->i_mount, vn_rele);
        XFS_STATS_INC(ip->i_mount, vn_remove);
 
@@ -1238,9 +1243,11 @@ xfs_fs_remount(
                token = match_token(p, tokens, args);
                switch (token) {
                case Opt_barrier:
+                       xfs_warn(mp, "%s option is deprecated, ignoring.", p);
                        mp->m_flags |= XFS_MOUNT_BARRIER;
                        break;
                case Opt_nobarrier:
+                       xfs_warn(mp, "%s option is deprecated, ignoring.", p);
                        mp->m_flags &= ~XFS_MOUNT_BARRIER;
                        break;
                case Opt_inode64: