diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-07 21:37:27 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-07 21:37:27 +0300 |
| commit | b8cac3cd24c19113982f929c65c50ce99d4cb83f (patch) | |
| tree | 309fa0efe3fcd0f16a3bd0ff0d6ac19544b15ef1 /fs/jfs/jfs_txnmgr.c | |
| parent | 9f2e3a53f7ec9ef55e9d01bc29a6285d291c151e (diff) | |
| parent | a5fdd713d256887b5f012608701149fa939e5645 (diff) | |
| download | linux-b8cac3cd24c19113982f929c65c50ce99d4cb83f.tar.xz | |
Merge tag 'jfs-5.2' of git://github.com/kleikamp/linux-shaggy
Pull jfs updates from Dave Kleikamp:
"Several minor jfs fixes"
* tag 'jfs-5.2' of git://github.com/kleikamp/linux-shaggy:
jfs: fix bogus variable self-initialization
fs/jfs: Switch to use new generic UUID API
jfs: compare old and new mode before setting update_mode flag
jfs: remove incorrect comment in jfs_superblock
jfs: fix spelling mistake, EACCESS -> EACCES
Diffstat (limited to 'fs/jfs/jfs_txnmgr.c')
| -rw-r--r-- | fs/jfs/jfs_txnmgr.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/jfs/jfs_txnmgr.c b/fs/jfs/jfs_txnmgr.c index a5663cb621d8..78789c5ed36b 100644 --- a/fs/jfs/jfs_txnmgr.c +++ b/fs/jfs/jfs_txnmgr.c @@ -1928,8 +1928,7 @@ static void xtLog(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd, * header ? */ if (tlck->type & tlckTRUNCATE) { - /* This odd declaration suppresses a bogus gcc warning */ - pxd_t pxd = pxd; /* truncated extent of xad */ + pxd_t pxd; /* truncated extent of xad */ int twm; /* |