diff options
Diffstat (limited to 'fs/gfs2/inode.c')
| -rw-r--r-- | fs/gfs2/inode.c | 6 | 
1 files changed, 2 insertions, 4 deletions
| diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c index 6e220f4eee7d..b1bf2694fb2b 100644 --- a/fs/gfs2/inode.c +++ b/fs/gfs2/inode.c | |||
| @@ -45,7 +45,7 @@ static int iget_test(struct inode *inode, void *opaque) | |||
| 45 | struct gfs2_inode *ip = GFS2_I(inode); | 45 | struct gfs2_inode *ip = GFS2_I(inode); | 
| 46 | u64 *no_addr = opaque; | 46 | u64 *no_addr = opaque; | 
| 47 | 47 | ||
| 48 | if (ip->i_no_addr == *no_addr && test_bit(GIF_USER, &ip->i_flags)) | 48 | if (ip->i_no_addr == *no_addr) | 
| 49 | return 1; | 49 | return 1; | 
| 50 | 50 | ||
| 51 | return 0; | 51 | return 0; | 
| @@ -58,7 +58,6 @@ static int iget_set(struct inode *inode, void *opaque) | |||
| 58 | 58 | ||
| 59 | inode->i_ino = (unsigned long)*no_addr; | 59 | inode->i_ino = (unsigned long)*no_addr; | 
| 60 | ip->i_no_addr = *no_addr; | 60 | ip->i_no_addr = *no_addr; | 
| 61 | set_bit(GIF_USER, &ip->i_flags); | ||
| 62 | return 0; | 61 | return 0; | 
| 63 | } | 62 | } | 
| 64 | 63 | ||
| @@ -84,7 +83,7 @@ static int iget_skip_test(struct inode *inode, void *opaque) | |||
| 84 | struct gfs2_inode *ip = GFS2_I(inode); | 83 | struct gfs2_inode *ip = GFS2_I(inode); | 
| 85 | struct gfs2_skip_data *data = opaque; | 84 | struct gfs2_skip_data *data = opaque; | 
| 86 | 85 | ||
| 87 | if (ip->i_no_addr == data->no_addr && test_bit(GIF_USER, &ip->i_flags)){ | 86 | if (ip->i_no_addr == data->no_addr) { | 
| 88 | if (inode->i_state & (I_FREEING|I_CLEAR|I_WILL_FREE)){ | 87 | if (inode->i_state & (I_FREEING|I_CLEAR|I_WILL_FREE)){ | 
| 89 | data->skipped = 1; | 88 | data->skipped = 1; | 
| 90 | return 0; | 89 | return 0; | 
| @@ -103,7 +102,6 @@ static int iget_skip_set(struct inode *inode, void *opaque) | |||
| 103 | return 1; | 102 | return 1; | 
| 104 | inode->i_ino = (unsigned long)(data->no_addr); | 103 | inode->i_ino = (unsigned long)(data->no_addr); | 
| 105 | ip->i_no_addr = data->no_addr; | 104 | ip->i_no_addr = data->no_addr; | 
| 106 | set_bit(GIF_USER, &ip->i_flags); | ||
| 107 | return 0; | 105 | return 0; | 
| 108 | } | 106 | } | 
| 109 | 107 | ||
