← Back to branch summary

~ubuntu-branches/debian/wheezy/linux-2.6/wheezy

« back to all changes in this revision

Viewing changes to fs/ext4/fsync.c

  • Committer: Bazaar Package Importer
  • Author(s): Ben Hutchings, Ben Hutchings, Aurelien Jarno
  • Date: 2011-06-07 12:14:05 UTC
  • mfrom: (43.1.9 sid)
  • Revision ID: james.westby@ubuntu.com-20110607121405-i3h1rd7nrnd2b73h
Tags: 2.6.39-2
http://bugs.debian.org/627492
http://bugs.debian.org/596626
http://bugs.debian.org/628932
http://bugs.debian.org/628191
http://bugs.debian.org/627837
http://bugs.debian.org/622997
http://bugs.debian.org/622745
http://bugs.debian.org/619827
http://bugs.debian.org/629401
[ Ben Hutchings ]
* [x86] Enable BACKLIGHT_APPLE, replacing BACKLIGHT_MBP_NVIDIA
  (Closes: #627492)
* cgroups: Disable memory resource controller by default. Allow it
  to be enabled using kernel parameter 'cgroup_enable=memory'.
* rt2800usb: Enable support for more USB devices including
  Linksys WUSB600N (Closes: #596626) (this change was accidentally
  omitted from 2.6.39-1)
* [x86] Remove Celeron from list of processors supporting PAE. Most
  'Celeron M' models do not.
* Update debconf template translations:
  - Swedish (Martin Bagge) (Closes: #628932)
  - French (David Prévot) (Closes: #628191)
* aufs: Update for 2.6.39 (Closes: #627837)
* Add stable 2.6.39.1, including:
  - ext4: dont set PageUptodate in ext4_end_bio()
  - pata_cmd64x: fix boot crash on parisc (Closes: #622997, #622745)
  - ext3: Fix fs corruption when make_indexed_dir() fails
  - netfilter: nf_ct_sip: validate Content-Length in TCP SIP messages
  - sctp: fix race between sctp_bind_addr_free() and
    sctp_bind_addr_conflict()
  - sctp: fix memory leak of the ASCONF queue when free asoc
  - md/bitmap: fix saving of events_cleared and other state
  - cdc_acm: Fix oops when Droids MuIn LCD is connected
  - cx88: Fix conversion from BKL to fine-grained locks (Closes: #619827)
  - keys: Set cred->user_ns in key_replace_session_keyring (CVE-2011-2184)
  - tmpfs: fix race between truncate and writepage
  - nfs41: Correct offset for LAYOUTCOMMIT
  - xen/mmu: fix a race window causing leave_mm BUG()
  - ext4: fix possible use-after-free in ext4_remove_li_request()
  For the complete list of changes, see:
   http://www.kernel.org/pub/linux/kernel/v2.6/ChangeLog-2.6.39.1
* Bump ABI to 2
* netfilter: Enable IP_SET, IP_SET_BITMAP_IP, IP_SET_BITMAP_IPMAC,
  IP_SET_BITMAP_PORT, IP_SET_HASH_IP, IP_SET_HASH_IPPORT,
  IP_SET_HASH_IPPORTIP, IP_SET_HASH_IPPORTNET, IP_SET_HASH_NET,
  IP_SET_HASH_NETPORT, IP_SET_LIST_SET, NETFILTER_XT_SET as modules
  (Closes: #629401)

[ Aurelien Jarno ]
* [mipsel/loongson-2f] Disable_SCSI_LPFC to workaround GCC ICE.

Show diffs side-by-side

added added

removed removed

Lines of Context:
fs/ext4/fsync.c
101
101
                 * to the work-to-be schedule is freed.
102
102
                 *
103
103
                 * Thus we need to keep the io structure still valid here after
104
 
                 * convertion finished. The io structure has a flag to
 
104
                 * conversion finished. The io structure has a flag to
105
105
                 * avoid double converting from both fsync and background work
106
106
                 * queue work.
107
107
                 */
125
125
 * the parent directory's parent as well, and so on recursively, if
126
126
 * they are also freshly created.
127
127
 */
128
 
static void ext4_sync_parent(struct inode *inode)
 
128
static int ext4_sync_parent(struct inode *inode)
129
129
{
 
130
        struct writeback_control wbc;
130
131
        struct dentry *dentry = NULL;
 
132
        int ret = 0;
131
133
 
132
134
        while (inode && ext4_test_inode_state(inode, EXT4_STATE_NEWENTRY)) {
133
135
                ext4_clear_inode_state(inode, EXT4_STATE_NEWENTRY);
136
138
                if (!dentry || !dentry->d_parent || !dentry->d_parent->d_inode)
137
139
                        break;
138
140
                inode = dentry->d_parent->d_inode;
139
 
                sync_mapping_buffers(inode->i_mapping);
 
141
                ret = sync_mapping_buffers(inode->i_mapping);
 
142
                if (ret)
 
143
                        break;
 
144
                memset(&wbc, 0, sizeof(wbc));
 
145
                wbc.sync_mode = WB_SYNC_ALL;
 
146
                wbc.nr_to_write = 0;         /* only write out the inode */
 
147
                ret = sync_inode(inode, &wbc);
 
148
                if (ret)
 
149
                        break;
140
150
        }
 
151
        return ret;
141
152
}
142
153
 
143
154
/*
164
175
 
165
176
        J_ASSERT(ext4_journal_current_handle() == NULL);
166
177
 
167
 
        trace_ext4_sync_file(file, datasync);
 
178
        trace_ext4_sync_file_enter(file, datasync);
168
179
 
169
180
        if (inode->i_sb->s_flags & MS_RDONLY)
170
181
                return 0;
171
182
 
172
183
        ret = ext4_flush_completed_IO(inode);
173
184
        if (ret < 0)
174
 
                return ret;
 
185
                goto out;
175
186
 
176
187
        if (!journal) {
177
188
                ret = generic_file_fsync(file, datasync);
178
189
                if (!ret && !list_empty(&inode->i_dentry))
179
 
                        ext4_sync_parent(inode);
180
 
                return ret;
 
190
                        ret = ext4_sync_parent(inode);
 
191
                goto out;
181
192
        }
182
193
 
183
194
        /*
194
205
         *  (they were dirtied by commit).  But that's OK - the blocks are
195
206
         *  safe in-journal, which is all fsync() needs to ensure.
196
207
         */
197
 
        if (ext4_should_journal_data(inode))
198
 
                return ext4_force_commit(inode->i_sb);
 
208
        if (ext4_should_journal_data(inode)) {
 
209
                ret = ext4_force_commit(inode->i_sb);
 
210
                goto out;
 
211
        }
199
212
 
200
213
        commit_tid = datasync ? ei->i_datasync_tid : ei->i_sync_tid;
201
214
        if (jbd2_log_start_commit(journal, commit_tid)) {
215
228
                ret = jbd2_log_wait_commit(journal, commit_tid);
216
229
        } else if (journal->j_flags & JBD2_BARRIER)
217
230
                blkdev_issue_flush(inode->i_sb->s_bdev, GFP_KERNEL, NULL);
 
231
 out:
 
232
        trace_ext4_sync_file_exit(inode, ret);
218
233
        return ret;
219
234
}