Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/shaggy/jfs-2.6
+1
-2
fs/jfs/inode.c
+1
-2
fs/jfs/inode.c
···
129
129
jfs_info("In jfs_delete_inode, inode = 0x%p", inode);
130
130
131
131
if (!is_bad_inode(inode) &&
132
-
(JFS_IP(inode)->fileset == cpu_to_le32(FILESYSTEM_I))) {
133
-
132
+
(JFS_IP(inode)->fileset == FILESYSTEM_I)) {
134
133
truncate_inode_pages(&inode->i_data, 0);
135
134
136
135
if (test_cflag(COMMIT_Freewmap, inode))
+1
-1
fs/jfs/jfs_dmap.c
+1
-1
fs/jfs/jfs_dmap.c
+11
-4
fs/jfs/jfs_txnmgr.c
+11
-4
fs/jfs/jfs_txnmgr.c
···
725
725
else
726
726
tlck->flag = tlckINODELOCK;
727
727
728
+
if (S_ISDIR(ip->i_mode))
729
+
tlck->flag |= tlckDIRECTORY;
730
+
728
731
tlck->type = 0;
729
732
730
733
/* bind the tlock and the page */
···
1012
1009
1013
1010
/* bind the tlock and the object */
1014
1011
tlck->flag = tlckINODELOCK;
1012
+
if (S_ISDIR(ip->i_mode))
1013
+
tlck->flag |= tlckDIRECTORY;
1015
1014
tlck->ip = ip;
1016
1015
tlck->mp = NULL;
1017
1016
···
1082
1077
linelock->flag = tlckLINELOCK;
1083
1078
linelock->maxcnt = TLOCKLONG;
1084
1079
linelock->index = 0;
1080
+
if (tlck->flag & tlckDIRECTORY)
1081
+
linelock->flag |= tlckDIRECTORY;
1085
1082
1086
1083
/* append linelock after tlock */
1087
1084
linelock->next = tlock->next;
···
2077
2070
*
2078
2071
* function: log from maplock of freed data extents;
2079
2072
*/
2080
-
void mapLog(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd,
2081
-
struct tlock * tlck)
2073
+
static void mapLog(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd,
2074
+
struct tlock * tlck)
2082
2075
{
2083
2076
struct pxd_lock *pxdlock;
2084
2077
int i, nlock;
···
2216
2209
* function: synchronously write pages locked by transaction
2217
2210
* after txLog() but before txUpdateMap();
2218
2211
*/
2219
-
void txForce(struct tblock * tblk)
2212
+
static void txForce(struct tblock * tblk)
2220
2213
{
2221
2214
struct tlock *tlck;
2222
2215
lid_t lid, next;
···
2365
2358
*/
2366
2359
else { /* (maplock->flag & mlckFREE) */
2367
2360
2368
-
if (S_ISDIR(tlck->ip->i_mode))
2361
+
if (tlck->flag & tlckDIRECTORY)
2369
2362
txFreeMap(ipimap, maplock,
2370
2363
tblk, COMMIT_PWMAP);
2371
2364
else