Skip to content

Commit 742b344

Browse files
committed
cifs: Remove some code that's no longer used, part 1
Remove some code that was #if'd out with the netfslib conversion. This is split into parts for file.c as the diff generator otherwise produces a hard to read diff for part of it where a big chunk is cut out. Signed-off-by: David Howells <[email protected]> cc: Steve French <[email protected]> cc: Shyam Prasad N <[email protected]> cc: Rohith Surabattula <[email protected]> cc: Jeff Layton <[email protected]> cc: [email protected] cc: [email protected] cc: [email protected] cc: [email protected]
1 parent 3ee1a1f commit 742b344

File tree

5 files changed

+0
-825
lines changed

5 files changed

+0
-825
lines changed

fs/smb/client/cifsglob.h

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1515,18 +1515,6 @@ struct cifs_io_subrequest {
15151515
struct smbd_mr *mr;
15161516
#endif
15171517
struct cifs_credits credits;
1518-
1519-
#if 0 // TODO: Remove following elements
1520-
struct list_head list;
1521-
struct completion done;
1522-
struct work_struct work;
1523-
struct cifsFileInfo *cfile;
1524-
struct address_space *mapping;
1525-
struct cifs_aio_ctx *ctx;
1526-
enum writeback_sync_modes sync_mode;
1527-
bool uncached;
1528-
struct bio_vec *bv;
1529-
#endif
15301518
};
15311519

15321520
/*

fs/smb/client/cifsproto.h

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -601,36 +601,11 @@ void __cifs_put_smb_ses(struct cifs_ses *ses);
601601
extern struct cifs_ses *
602602
cifs_get_smb_ses(struct TCP_Server_Info *server, struct smb3_fs_context *ctx);
603603

604-
#if 0 // TODO Remove
605-
void cifs_readdata_release(struct cifs_io_subrequest *rdata);
606-
static inline void cifs_get_readdata(struct cifs_io_subrequest *rdata)
607-
{
608-
refcount_inc(&rdata->subreq.ref);
609-
}
610-
static inline void cifs_put_readdata(struct cifs_io_subrequest *rdata)
611-
{
612-
if (refcount_dec_and_test(&rdata->subreq.ref))
613-
cifs_readdata_release(rdata);
614-
}
615-
#endif
616604
int cifs_async_readv(struct cifs_io_subrequest *rdata);
617605
int cifs_readv_receive(struct TCP_Server_Info *server, struct mid_q_entry *mid);
618606

619607
void cifs_async_writev(struct cifs_io_subrequest *wdata);
620608
void cifs_writev_complete(struct work_struct *work);
621-
#if 0 // TODO Remove
622-
struct cifs_io_subrequest *cifs_writedata_alloc(work_func_t complete);
623-
void cifs_writedata_release(struct cifs_io_subrequest *rdata);
624-
static inline void cifs_get_writedata(struct cifs_io_subrequest *wdata)
625-
{
626-
refcount_inc(&wdata->subreq.ref);
627-
}
628-
static inline void cifs_put_writedata(struct cifs_io_subrequest *wdata)
629-
{
630-
if (refcount_dec_and_test(&wdata->subreq.ref))
631-
cifs_writedata_release(wdata);
632-
}
633-
#endif
634609
int cifs_query_mf_symlink(unsigned int xid, struct cifs_tcon *tcon,
635610
struct cifs_sb_info *cifs_sb,
636611
const unsigned char *path, char *pbuf,

0 commit comments

Comments
 (0)