Merge branches 'iser' and 'qib' into for-next

[linux-2.6-microblaze.git] / kernel / acct.c

diff --git a/kernel/acct.c b/kernel/acct.c
index 85389fe..8d6e145 100644 (file)
--- a/kernel/acct.c
+++ b/kernel/acct.c
@@ -539,11 +539,16 @@ static void do_acct_process(struct bsd_acct_struct *acct,
        ac.ac_rw = encode_comp_t(ac.ac_io / 1024);
        ac.ac_swaps = encode_comp_t(0);
 
+       /*
+        * Get freeze protection. If the fs is frozen, just skip the write
+        * as we could deadlock the system otherwise.
+        */
+       if (!file_start_write_trylock(file))
+               goto out;
        /*
         * Kernel segment override to datasegment and write it
         * to the accounting file.
         */
-       file_start_write(file);
        fs = get_fs();
        set_fs(KERNEL_DS);
        /*