LU-359 llite: no close error if application has known failure

[fs/lustre-release.git] / lustre / llite / llite_lib.c

diff --git a/lustre/llite/llite_lib.c b/lustre/llite/llite_lib.c
index 6da9064..1457303 100644 (file)
--- a/lustre/llite/llite_lib.c
+++ b/lustre/llite/llite_lib.c
@@ -59,7 +59,7 @@
 cfs_mem_cache_t *ll_file_data_slab;
 
 CFS_LIST_HEAD(ll_super_blocks);
-cfs_spinlock_t ll_sb_lock = CFS_SPIN_LOCK_UNLOCKED;
+DEFINE_SPINLOCK(ll_sb_lock);
 
 #ifndef MS_HAS_NEW_AOPS
 extern struct address_space_operations ll_aops;
@@ -463,7 +463,7 @@ static int client_common_fill_super(struct super_block *sb, char *md, char *dt,
         CDEBUG(D_SUPER, "rootfid "DFID"\n", PFID(&sbi->ll_root_fid));
 
         sb->s_op = &lustre_super_operations;
-#if THREAD_SIZE >= 8192
+#if THREAD_SIZE >= 8192 /*b=17630*/ && !defined(HAVE_FSTYPE_MOUNT) /*LU-812*/
         sb->s_export_op = &lustre_export_operations;
 #endif
 
@@ -639,10 +639,10 @@ void lustre_dump_dentry(struct dentry *dentry, int recur)
         if (recur == 0)
                 return;
 
-       list_for_each(tmp, &dentry->d_subdirs) {
-                struct dentry *d = list_entry(tmp, struct dentry, d_child);
-                lustre_dump_dentry(d, recur - 1);
-        }
+       list_for_each(tmp, &dentry->d_subdirs) {
+               struct dentry *d = list_entry(tmp, struct dentry, d_u.d_child);
+               lustre_dump_dentry(d, recur - 1);
+       }
 }
 
 void client_common_put_super(struct super_block *sb)
@@ -906,13 +906,12 @@ void ll_lli_init(struct ll_inode_info *lli)
                 lli->lli_symlink_name = NULL;
                 cfs_init_rwsem(&lli->lli_trunc_sem);
                 cfs_mutex_init(&lli->lli_write_mutex);
-                lli->lli_async_rc = 0;
-                lli->lli_write_rc = 0;
-                cfs_init_rwsem(&lli->lli_glimpse_sem);
-                lli->lli_glimpse_time = 0;
-                CFS_INIT_LIST_HEAD(&lli->lli_agl_list);
-                lli->lli_agl_index = 0;
-        }
+               cfs_init_rwsem(&lli->lli_glimpse_sem);
+               lli->lli_glimpse_time = 0;
+               CFS_INIT_LIST_HEAD(&lli->lli_agl_list);
+               lli->lli_agl_index = 0;
+               lli->lli_async_rc = 0;
+       }
        cfs_mutex_init(&lli->lli_layout_mutex);
 }
 
@@ -1315,6 +1314,50 @@ static int ll_setattr_ost(struct inode *inode, struct iattr *attr)
         return rc;
 }
 
+#ifndef HAVE_VFS_INODE_NEWSIZE_OK
+/**
+ * inode_newsize_ok - may this inode be truncated to a given size
+ * @inode:      the inode to be truncated
+ * @offset:     the new size to assign to the inode
+ * @Returns:    0 on success, -ve errno on failure
+ *
+ * inode_newsize_ok will check filesystem limits and ulimits to check that the
+ * new inode size is within limits. inode_newsize_ok will also send SIGXFSZ
+ * when necessary. Caller must not proceed with inode size change if failure is
+ * returned. @inode must be a file (not directory), with appropriate
+ * permissions to allow truncate (inode_newsize_ok does NOT check these
+ * conditions).
+ *
+ * inode_newsize_ok must be called with i_mutex held.
+ */
+int inode_newsize_ok(const struct inode *inode, loff_t offset)
+{
+       if (inode->i_size < offset) {
+               unsigned long limit;
+
+               limit = rlimit(RLIMIT_FSIZE);
+               if (limit != RLIM_INFINITY && offset > limit)
+                       goto out_sig;
+               if (offset > inode->i_sb->s_maxbytes)
+                       goto out_big;
+       } else {
+               /*
+                * truncation of in-use swapfiles is disallowed - it would
+                * cause subsequent swapout to scribble on the now-freed
+                * blocks.
+                */
+               if (IS_SWAPFILE(inode))
+                       return -ETXTBSY;
+       }
+
+       return 0;
+out_sig:
+       send_sig(SIGXFSZ, current, 0);
+out_big:
+       return -EFBIG;
+}
+#endif
+
 /* If this inode has objects allocated to it (lsm != NULL), then the OST
  * object(s) determine the file size and mtime.  Otherwise, the MDS will
  * keep these values until such a time that objects are allocated for it.
@@ -1394,15 +1437,15 @@ int ll_setattr_raw(struct dentry *dentry, struct iattr *attr)
         if (op_data == NULL)
                 RETURN(-ENOMEM);
 
-        if (!S_ISDIR(inode->i_mode)) {
-                if (ia_valid & ATTR_SIZE)
-                        UP_WRITE_I_ALLOC_SEM(inode);
-                UNLOCK_INODE_MUTEX(inode);
-                cfs_down_write(&lli->lli_trunc_sem);
-                LOCK_INODE_MUTEX(inode);
-                if (ia_valid & ATTR_SIZE)
-                        DOWN_WRITE_I_ALLOC_SEM(inode);
-        }
+       if (!S_ISDIR(inode->i_mode)) {
+               if (ia_valid & ATTR_SIZE)
+                       UP_WRITE_I_ALLOC_SEM(inode);
+               mutex_unlock(&inode->i_mutex);
+               cfs_down_write(&lli->lli_trunc_sem);
+               mutex_lock(&inode->i_mutex);
+               if (ia_valid & ATTR_SIZE)
+                       DOWN_WRITE_I_ALLOC_SEM(inode);
+       }
 
        /* We need a steady stripe configuration for setattr to avoid
         * confusion. */
@@ -1539,16 +1582,11 @@ int ll_statfs_internal(struct super_block *sb, struct obd_statfs *osfs,
 
         RETURN(rc);
 }
-#ifndef HAVE_STATFS_DENTRY_PARAM
-int ll_statfs(struct super_block *sb, struct kstatfs *sfs)
-{
-#else
 int ll_statfs(struct dentry *de, struct kstatfs *sfs)
 {
-        struct super_block *sb = de->d_sb;
-#endif
-        struct obd_statfs osfs;
-        int rc;
+       struct super_block *sb = de->d_sb;
+       struct obd_statfs osfs;
+       int rc;
 
         CDEBUG(D_VFSTRACE, "VFS Op: at "LPU64" jiffies\n", get_jiffies_64());
         ll_stats_ops_tally(ll_s2sbi(sb), LPROC_LL_STAFS, 1);
@@ -1679,9 +1717,6 @@ void ll_update_inode(struct inode *inode, struct lustre_md *md)
         } else {
                 inode->i_blkbits = inode->i_sb->s_blocksize_bits;
         }
-#ifdef HAVE_INODE_BLKSIZE
-        inode->i_blksize = 1<<inode->i_blkbits;
-#endif
         if (body->valid & OBD_MD_FLUID)
                 inode->i_uid = body->uid;
         if (body->valid & OBD_MD_FLGID)